|
(cherry picked from commit bea9a9501814bdbc342a2adfa57019704260a532)
Conflicts:
extras/source/gallery/gallery_system/sg10.sdg
extras/source/gallery/gallery_system/sg10.thm
extras/source/gallery/gallery_system/sg12.sdg
extras/source/gallery/gallery_system/sg12.sdv
extras/source/gallery/gallery_system/sg12.thm
extras/source/gallery/gallery_system/sg16.sdv
extras/source/gallery/gallery_system/sg17.sdg
extras/source/gallery/gallery_system/sg17.thm
extras/source/gallery/gallery_system/sg19.sdg
extras/source/gallery/gallery_system/sg19.sdv
extras/source/gallery/gallery_system/sg19.thm
extras/source/gallery/gallery_system/sg2.sdv
Change-Id: I4c2e34c470b05ddae5923e782c31d15aa4961e0d
|
