OSDN Git Service
Michael Jurka [Thu, 25 Oct 2012 19:25:31 +0000 (12:25 -0700)]
Merge "Fix build" into jb-mr1-dev
nicolasroard [Thu, 25 Oct 2012 19:19:42 +0000 (12:19 -0700)]
am
8bc296e2: Fix crash when starting filtereditor
* commit '
8bc296e233298dbc76da22f01aaffec11e539d19':
Fix crash when starting filtereditor
Michael Jurka [Thu, 25 Oct 2012 19:14:38 +0000 (12:14 -0700)]
Fix build
Change-Id: Ic8ff27ff1bc0953a81deab631c268c74324e6415
nicolasroard [Thu, 25 Oct 2012 18:54:57 +0000 (11:54 -0700)]
Fix crash when starting filtereditor
bug:
7415170
Change-Id: I9d54b1179f343aa089bfd9a065ecddaa8a4283b8
Angus Kong [Thu, 25 Oct 2012 18:26:10 +0000 (11:26 -0700)]
am
71c17775: Force renderring request for Camera Animation.
* commit '
71c177759c7aa10082c8fdf909b701cf0047bead':
Force renderring request for Camera Animation.
Angus Kong [Thu, 25 Oct 2012 12:08:14 +0000 (20:08 +0800)]
Force renderring request for Camera Animation.
bug:
7410862
Change-Id: I439186f2fea5ee0939ddcfcb9d77a49d0047727b
nicolasroard [Thu, 25 Oct 2012 05:44:13 +0000 (22:44 -0700)]
am
dffe6a6f: Fix default for tiny planet
* commit '
dffe6a6f8bbf4565df211b07bcfc23d6864a48b6':
Fix default for tiny planet
nicolasroard [Thu, 25 Oct 2012 05:03:55 +0000 (22:03 -0700)]
am
e7a71372: Fix update view
* commit '
e7a71372747af0ef03f9d953c28ed62de58315d3':
Fix update view
nicolasroard [Thu, 25 Oct 2012 05:02:40 +0000 (22:02 -0700)]
Fix default for tiny planet
bug:
7410938
Change-Id: If43317c2ad1e22ca1a3d3de1eef91ea2556252dd
nicolasroard [Thu, 25 Oct 2012 04:50:24 +0000 (21:50 -0700)]
Fix update view
bug:
7410583
Change-Id: I8e773bc4ba550c2a362b46e5a6488ad7b3c29646
nicolasroard [Thu, 25 Oct 2012 04:13:27 +0000 (21:13 -0700)]
am
ea3c51ff: Merge "Remove the old photo editor" into gb-ub-photos-arches
* commit '
ea3c51ff451f2e5efc00912ff993e232e5f07cd7':
Remove the old photo editor
nicolasroard [Thu, 25 Oct 2012 04:11:06 +0000 (21:11 -0700)]
Merge "Remove the old photo editor" into gb-ub-photos-arches
Sascha Haeberling [Thu, 25 Oct 2012 03:06:38 +0000 (20:06 -0700)]
am
b13e1788: Merge "Fixes TinyPlanet crashed due to too excessive memory usage." into gb-ub-photos-arches
* commit '
b13e1788ddf886fcdfd1ec837a59ec242bb33dae':
Fixes TinyPlanet crashed due to too excessive memory usage.
Sascha Haeberling [Thu, 25 Oct 2012 03:04:48 +0000 (20:04 -0700)]
Merge "Fixes TinyPlanet crashed due to too excessive memory usage." into gb-ub-photos-arches
Ruben Brunk [Thu, 25 Oct 2012 02:39:17 +0000 (19:39 -0700)]
am
4a601448: Merge "Fixed blackscreen when launching crop from menu." into gb-ub-photos-arches
* commit '
4a601448dff06711df2d08e75d4b0c43aa57600e':
Fixed blackscreen when launching crop from menu.
Ruben Brunk [Thu, 25 Oct 2012 02:37:52 +0000 (19:37 -0700)]
Merge "Fixed blackscreen when launching crop from menu." into gb-ub-photos-arches
Ruben Brunk [Thu, 25 Oct 2012 02:09:09 +0000 (19:09 -0700)]
Fixed blackscreen when launching crop from menu.
Bug:
7410287
Change-Id: I60ae95cff82c789df37ce1b45fbaaaffa1aa552b
Sascha Haeberling [Thu, 25 Oct 2012 01:35:37 +0000 (18:35 -0700)]
Fixes TinyPlanet crashed due to too excessive memory usage.
Bug:
7409664
Change-Id: If82882ce7186500f5a3af769d490275233a6191c
nicolasroard [Thu, 25 Oct 2012 01:39:47 +0000 (18:39 -0700)]
am
2c6ea941: Add rotation to tinyplanet view
* commit '
2c6ea941a80ea22317d664e329aed51f5f7417b9':
Add rotation to tinyplanet view
nicolasroard [Thu, 25 Oct 2012 00:55:51 +0000 (17:55 -0700)]
Remove the old photo editor
bug:
7407573
Change-Id: Ifac6d3d7cec02c9cb8ef8bbd390f0512e6cdb66c
(cherry picked from commit
a96c8e9c9aac509ba074b340c66e31e20ec05823)
nicolasroard [Thu, 25 Oct 2012 00:47:12 +0000 (17:47 -0700)]
Add rotation to tinyplanet view
bug:
7389189
Change-Id: Ib072879190bcd96c552581bf9240876b10ca362d
nicolasroard [Thu, 25 Oct 2012 00:28:55 +0000 (17:28 -0700)]
nicolasroard [Wed, 24 Oct 2012 23:39:41 +0000 (16:39 -0700)]
Fixes UI stuff
bug:
7393871
bug:
7387596
Change-Id: I833c6f713ab71c4dce896f66e191a2a1a42b3e2f
Teng-Hui Zhu [Wed, 24 Oct 2012 23:36:26 +0000 (16:36 -0700)]
am
ecbdca3d: Merge "Initialize the modified date correctly." into gb-ub-photos-arches
* commit '
ecbdca3de8ada82d3d6f723d9ba509a3b1b1b290':
Initialize the modified date correctly.
Teng-Hui Zhu [Wed, 24 Oct 2012 23:33:47 +0000 (16:33 -0700)]
Merge "Initialize the modified date correctly." into gb-ub-photos-arches
nicolasroard [Wed, 24 Oct 2012 22:54:46 +0000 (15:54 -0700)]
am
0a23b42e: Change background and panel colors
* commit '
0a23b42e4a3e3a93ce7389bfb7352944f644add6':
Change background and panel colors
nicolasroard [Wed, 24 Oct 2012 22:43:56 +0000 (15:43 -0700)]
Change background and panel colors
bug:
7385980
Change-Id: I67edeeda0df311203e4cedc140d42a3d9d41a7b4
Teng-Hui Zhu [Wed, 24 Oct 2012 22:08:59 +0000 (15:08 -0700)]
Initialize the modified date correctly.
On top of that, the date_taken is in units of seconds, while others are in
units of milliseconds.
bug:
7307090
Change-Id: I3f14a6354fa72a20d228d49a92d5c2007ca29df1
Bobby Georgescu [Wed, 24 Oct 2012 21:27:06 +0000 (14:27 -0700)]
am
86282c88: Merge "Fix attempted uploading of recycled tiles" into gb-ub-photos-arches
* commit '
86282c8860edfec0df5c28d22d52aa4b59112d55':
Fix attempted uploading of recycled tiles
Bobby Georgescu [Wed, 24 Oct 2012 21:25:38 +0000 (14:25 -0700)]
Merge "Fix attempted uploading of recycled tiles" into gb-ub-photos-arches
John Reck [Wed, 24 Oct 2012 21:21:55 +0000 (14:21 -0700)]
am
d49d5320: Move loadBitmap to async task
* commit '
d49d53206a197b08ec4754d8751b6860e33d9f48':
Move loadBitmap to async task
Bobby Georgescu [Wed, 24 Oct 2012 21:15:38 +0000 (14:15 -0700)]
Fix attempted uploading of recycled tiles
Bug:
7405398
Change-Id: I17711f9c724af216aa22cee6a86d9feba84c1548
John Reck [Wed, 24 Oct 2012 19:56:31 +0000 (12:56 -0700)]
Move loadBitmap to async task
Bug:
7406705
Change-Id: I4e540e08d239d2e57f0ae6be5d70c8777cdbab2a
Bobby Georgescu [Wed, 24 Oct 2012 20:53:26 +0000 (13:53 -0700)]
am
5bd00332: Launch built-in camera app via filmstrip
* commit '
5bd00332556b20c141b5c7f16433d55b1bc7fe0f':
Launch built-in camera app via filmstrip
Bobby Georgescu [Wed, 24 Oct 2012 19:09:38 +0000 (12:09 -0700)]
Launch built-in camera app via filmstrip
Bug:
7407182
Change-Id: I25e0028dd5f3889f7837494e0bf25c54edbb4405
Ruben Brunk [Wed, 24 Oct 2012 18:50:36 +0000 (11:50 -0700)]
am
eb6a24e1: Took out aspect ratio switching.
* commit '
eb6a24e13ab8bc6f2a70bf5e8cc70f469809acb9':
Took out aspect ratio switching.
Ruben Brunk [Wed, 24 Oct 2012 18:05:45 +0000 (11:05 -0700)]
Took out aspect ratio switching.
Bug:
7406414
Change-Id: Iba6e59d728d6f1ce81ea62b01a86dfaa355383b9
nicolasroard [Wed, 24 Oct 2012 18:39:17 +0000 (11:39 -0700)]
am
ca05711f: Merge "Save the image when applying tiny planet" into gb-ub-photos-arches
* commit '
ca05711f0e6f788f0e2937fef04599d612911ca6':
Save the image when applying tiny planet
nicolasroard [Wed, 24 Oct 2012 18:38:24 +0000 (11:38 -0700)]
Merge "Save the image when applying tiny planet" into gb-ub-photos-arches
nicolasroard [Wed, 24 Oct 2012 18:31:57 +0000 (11:31 -0700)]
Save the image when applying tiny planet
bug:
7403622
Change-Id: Ic199b163d6418b6d45c2da10b915f2088dd52e16
John Hoford [Wed, 24 Oct 2012 18:17:00 +0000 (11:17 -0700)]
am
de00ad0d: Merge "limited the size of textures to 2048" into gb-ub-photos-arches
* commit '
de00ad0d02f4e328b93a1f5aa393dadf6e685033':
limited the size of textures to 2048
John Hoford [Wed, 24 Oct 2012 18:15:49 +0000 (11:15 -0700)]
Merge "limited the size of textures to 2048" into gb-ub-photos-arches
John Hoford [Wed, 24 Oct 2012 18:08:01 +0000 (11:08 -0700)]
limited the size of textures to 2048
bug:
7404007
Change-Id: I77fac900e213ca16c2accfa8f59d0cd300559836
Bobby Georgescu [Wed, 24 Oct 2012 16:56:33 +0000 (09:56 -0700)]
am
a1d04a4a: Merge "Do not show bottom controls when undo bar is visible" into gb-ub-photos-arches
* commit '
a1d04a4aef8117fa0c98b34a931a18a7b46073e3':
Do not show bottom controls when undo bar is visible
Bobby Georgescu [Wed, 24 Oct 2012 16:54:02 +0000 (09:54 -0700)]
Merge "Do not show bottom controls when undo bar is visible" into gb-ub-photos-arches
Baligh Uddin [Wed, 24 Oct 2012 16:46:18 +0000 (09:46 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Wed, 24 Oct 2012 16:44:08 +0000 (09:44 -0700)]
am
a4e538e0: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
a4e538e06ec0d3be8747babb1cc78ceb61fe1b10':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 24 Oct 2012 16:42:04 +0000 (09:42 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Bobby Georgescu [Wed, 24 Oct 2012 03:52:26 +0000 (20:52 -0700)]
Do not show bottom controls when undo bar is visible
Bug:
7403458
Change-Id: I1e789ebd7f08256a1ccbdb2ac9f2f9f97d0859c6
Bobby Georgescu [Wed, 24 Oct 2012 16:17:42 +0000 (09:17 -0700)]
am
f4a73264: Merge "Do not show Camera placeholder when not appropriate" into gb-ub-photos-arches
* commit '
f4a732646e9a4bf6f1f02b4eac0147adca4287c9':
Do not show Camera placeholder when not appropriate
Bobby Georgescu [Wed, 24 Oct 2012 16:15:52 +0000 (09:15 -0700)]
Merge "Do not show Camera placeholder when not appropriate" into gb-ub-photos-arches
Baligh Uddin [Wed, 24 Oct 2012 15:19:22 +0000 (08:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iea10dde43aa1a898cd822284d4256f3dfc80a3a4
Auto-generated-cl: translation import
Baligh Uddin [Wed, 24 Oct 2012 15:17:26 +0000 (08:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3411341031dc267cb2ee4ccc665e5598504d69c4
Auto-generated-cl: translation import
Owen Lin [Wed, 24 Oct 2012 08:33:16 +0000 (01:33 -0700)]
am
adee31f0: Use TiledTexture for thumbnails.
* commit '
adee31f028d839e7baa8f9e052dc4e4d60b137da':
Use TiledTexture for thumbnails.
Owen Lin [Tue, 23 Oct 2012 04:41:23 +0000 (12:41 +0800)]
Use TiledTexture for thumbnails.
1. Use TiledTexture for thumbnails to prevent jank in uploading big
thumbnails. (e.g., 512 * 512)
2. Use larger thumbnails (DISPLAY_LONG_SIDE / 5).
bug:
7381302
Change-Id: I7661d648373e893b40b2a0304037171760091e00
Sascha Haeberling [Wed, 24 Oct 2012 05:47:40 +0000 (22:47 -0700)]
am
c60752b2: Use XMP meta-data for correct tiny planets.
* commit '
c60752b28bcdc859b24040f77883568e0838ed74':
Use XMP meta-data for correct tiny planets.
Sascha Haeberling [Wed, 24 Oct 2012 05:34:21 +0000 (22:34 -0700)]
Use XMP meta-data for correct tiny planets.
Bug:
7403766
Change-Id: Ie03d40d0396d352d6fe48c91b995a2f872c98a06
Ruben Brunk [Wed, 24 Oct 2012 05:12:05 +0000 (22:12 -0700)]
am
eb75699b: Fixed scaling factor for ImageShow and rotations.
* commit '
eb75699bcd5762a9ffd7ee0d4d14a4e5eb2e2389':
Fixed scaling factor for ImageShow and rotations.
Ruben Brunk [Wed, 24 Oct 2012 01:11:10 +0000 (18:11 -0700)]
Fixed scaling factor for ImageShow and rotations.
Bug:
7392240
Bug:
7386048
Change-Id: I156c52acbd041604df2f7ccacca3a80f1b9fdb3b
Bobby Georgescu [Wed, 24 Oct 2012 03:29:57 +0000 (20:29 -0700)]
Do not show Camera placeholder when not appropriate
Bug:
7403454
Change-Id: I5cc0227f068da0ca596e6259314b9d2ade62de07
Ruben Brunk [Wed, 24 Oct 2012 02:43:38 +0000 (19:43 -0700)]
am
3fb20078: Merge "Fix so mirror gets applied." into gb-ub-photos-arches
* commit '
3fb2007892a436f704dc168c0549a6c8ee201e4a':
Fix so mirror gets applied.
Nicolas Roard [Wed, 24 Oct 2012 02:43:37 +0000 (19:43 -0700)]
am
d3aebee7: Merge "Support XMP data, fixed read file on another thread" into gb-ub-photos-arches
* commit '
d3aebee7b35ff969fce3607a5c051d607ca42ec7':
Support XMP data, fixed read file on another thread
Ruben Brunk [Wed, 24 Oct 2012 02:42:12 +0000 (19:42 -0700)]
Merge "Fix so mirror gets applied." into gb-ub-photos-arches
Nicolas Roard [Wed, 24 Oct 2012 02:40:46 +0000 (19:40 -0700)]
Merge "Support XMP data, fixed read file on another thread" into gb-ub-photos-arches
Ruben Brunk [Wed, 24 Oct 2012 02:30:00 +0000 (19:30 -0700)]
Fix so mirror gets applied.
Bug:
7402773
Change-Id: I531b795c2f43379e9eaf1ad3b9292e62c867ec3c
Doris Liu [Wed, 24 Oct 2012 01:55:23 +0000 (18:55 -0700)]
am
5d3e6653: Merge "Stay in AlbumPage when dismissing a popup from AP" into gb-ub-photos-arches
* commit '
5d3e665359272f8b7b379461ede24918d6b4537e':
Stay in AlbumPage when dismissing a popup from AP
Doris Liu [Wed, 24 Oct 2012 01:53:05 +0000 (18:53 -0700)]
Merge "Stay in AlbumPage when dismissing a popup from AP" into gb-ub-photos-arches
John Hoford [Wed, 24 Oct 2012 00:14:35 +0000 (17:14 -0700)]
Support XMP data, fixed read file on another thread
bug:
7293391
Change-Id: I634857dea3c4d0d204c3fb40f0eec9dc1a9af263
Ruben Brunk [Wed, 24 Oct 2012 01:07:27 +0000 (18:07 -0700)]
am
f46da69a: Increased touch tolerance in cropping.
* commit '
f46da69aefd9afe0b4326a2fcea8e33c294136bb':
Increased touch tolerance in cropping.
Ruben Brunk [Tue, 23 Oct 2012 21:48:58 +0000 (14:48 -0700)]
Increased touch tolerance in cropping.
Bug:
7342281
Change-Id: Ice2ba5f07074b1518e4064bbda489aae7ba17b22
Doris Liu [Tue, 23 Oct 2012 23:12:27 +0000 (16:12 -0700)]
Stay in AlbumPage when dismissing a popup from AP
Bug:
7384972
Change-Id: Ie2434ecc203a98610f1954b73a3d6916940eb812
Ruben Brunk [Wed, 24 Oct 2012 00:08:12 +0000 (17:08 -0700)]
am
a4122499: Reworked crop/transform UI.
* commit '
a41224997ef9be9c0d04534f7b6b9c6b933bfe05':
Reworked crop/transform UI.
Ruben Brunk [Mon, 22 Oct 2012 10:50:38 +0000 (03:50 -0700)]
Reworked crop/transform UI.
Bug:
7385644
Bug:
7378335
Bug:
7366075
Change-Id: Iee7e0a0741b69269b08726bad45e29d86834054e
John Hoford [Tue, 23 Oct 2012 22:58:55 +0000 (15:58 -0700)]
am
67fefdb9: add support for black and white filters, add rotation API to tiny planet
* commit '
67fefdb9b77644c955e1c0c5b1fcd51e2374f212':
add support for black and white filters, add rotation API to tiny planet
Bobby Georgescu [Tue, 23 Oct 2012 22:56:32 +0000 (15:56 -0700)]
am
a850a543: Fix jank when launching editor from Camera filmstrip
* commit '
a850a543225e9f7a72c5a49bb6099573c7efda13':
Fix jank when launching editor from Camera filmstrip
John Hoford [Tue, 23 Oct 2012 22:17:12 +0000 (15:17 -0700)]
add support for black and white filters, add rotation API to tiny planet
bug:
7386370
bug:
7389189
Change-Id: I1720893000c39edf28a356fb7b56634f004ef120
Bobby Georgescu [Tue, 23 Oct 2012 22:40:06 +0000 (15:40 -0700)]
Fix jank when launching editor from Camera filmstrip
Bug:
7301182
Status bar visibility in FilterShow will now match
the one in Camera/Gallery so that there isn't weird
jank when launching.
Change-Id: I3e942633b351264d2cd38cc5b587de32e38521ed
nicolasroard [Tue, 23 Oct 2012 22:33:09 +0000 (15:33 -0700)]
am
41a3a3be: Fix slider layout
* commit '
41a3a3be3f263a3b9c902fbec3124a7ea296d525':
Fix slider layout
nicolasroard [Tue, 23 Oct 2012 22:25:39 +0000 (15:25 -0700)]
Fix slider layout
bug:
7383094
Change-Id: I271728577e5a9fa4e1dbff354b37aee5d2aefb5c
nicolasroard [Tue, 23 Oct 2012 22:10:56 +0000 (15:10 -0700)]
am
cb993ff1: Merge "Express the borders size in percentages" into gb-ub-photos-arches
* commit '
cb993ff18944a7ba1981406c3c8adf3fe36755c0':
Express the borders size in percentages
John Reck [Tue, 23 Oct 2012 22:10:55 +0000 (15:10 -0700)]
am
d6453edc: Merge "Fix NPE" into gb-ub-photos-arches
* commit '
d6453edcdbdad2706d8ce4a4fddd8f7df347b78c':
Fix NPE
nicolasroard [Tue, 23 Oct 2012 22:09:53 +0000 (15:09 -0700)]
Merge "Express the borders size in percentages" into gb-ub-photos-arches
John Reck [Tue, 23 Oct 2012 22:08:35 +0000 (15:08 -0700)]
Merge "Fix NPE" into gb-ub-photos-arches
George Mount [Tue, 23 Oct 2012 22:06:44 +0000 (15:06 -0700)]
am
7d7f91e1: Merge "Fix NPE in detecting panoramas." into gb-ub-photos-arches
* commit '
7d7f91e1771e67af1fca5f2b3f221968df3de077':
Fix NPE in detecting panoramas.
George Mount [Tue, 23 Oct 2012 22:03:14 +0000 (15:03 -0700)]
Merge "Fix NPE in detecting panoramas." into gb-ub-photos-arches
John Reck [Tue, 23 Oct 2012 20:44:58 +0000 (13:44 -0700)]
Fix NPE
Bug:
7399438
Change-Id: Ida0bcc0689d5a797e3c60c3ee51542512fbadf1e
nicolasroard [Tue, 23 Oct 2012 21:33:47 +0000 (14:33 -0700)]
am
ea636029: Merge "Hide the history panel on rotation" into gb-ub-photos-arches
* commit '
ea6360298ca823634c9f2ee8990546f753288da9':
Hide the history panel on rotation
nicolasroard [Tue, 23 Oct 2012 21:09:53 +0000 (14:09 -0700)]
Express the borders size in percentages
bug:
7379459
Change-Id: I14c91dbee0480a3880a11b166fcce3673c2ff3eb
nicolasroard [Tue, 23 Oct 2012 21:31:49 +0000 (14:31 -0700)]
Merge "Hide the history panel on rotation" into gb-ub-photos-arches
George Mount [Tue, 23 Oct 2012 21:28:58 +0000 (14:28 -0700)]
Fix NPE in detecting panoramas.
Bug
7398022
Change-Id: Iae646c424ffbe552d014f563c8f4e5e4385b4724
nicolasroard [Tue, 23 Oct 2012 21:09:53 +0000 (14:09 -0700)]
Hide the history panel on rotation
bug:
7386882
Change-Id: Id68fa1680318b85b4b5b5e54221377d504687d93
Sascha Haeberling [Tue, 23 Oct 2012 21:05:21 +0000 (14:05 -0700)]
am
a681f36f: Merge "Make sure we use xmp_toolkit from external instead of the precompiled JAR." into gb-ub-photos-arches
* commit '
a681f36f3c0642135a3ad4dcd529cbff08798d53':
Make sure we use xmp_toolkit from external instead of the precompiled JAR.
Sascha Haeberling [Tue, 23 Oct 2012 21:03:32 +0000 (14:03 -0700)]
Merge "Make sure we use xmp_toolkit from external instead of the precompiled JAR." into gb-ub-photos-arches
Sascha Haeberling [Tue, 23 Oct 2012 20:38:52 +0000 (13:38 -0700)]
Make sure we use xmp_toolkit from external instead of the precompiled JAR.
Bug:
7400527
Change-Id: Ib9428af28c2c436485358dc4e07fe659ed961155
nicolasroard [Tue, 23 Oct 2012 20:05:46 +0000 (13:05 -0700)]
am
5d7e98f7: Fix another potential crash in Curves
* commit '
5d7e98f781fbd450295850d00adfb50540d53b3f':
Fix another potential crash in Curves
nicolasroard [Tue, 23 Oct 2012 19:59:16 +0000 (12:59 -0700)]
Fix another potential crash in Curves
bug:
7379140
Change-Id: I5f2f21b56595799c0e46e13bf5278b44803f4080
nicolasroard [Tue, 23 Oct 2012 19:47:27 +0000 (12:47 -0700)]
am
361f6234: Merge "Fix flickering in geometry panel" into gb-ub-photos-arches
* commit '
361f6234c02207b2d812db0b2aeed267013c9a1f':
Fix flickering in geometry panel
nicolasroard [Tue, 23 Oct 2012 19:45:50 +0000 (12:45 -0700)]
Merge "Fix flickering in geometry panel" into gb-ub-photos-arches
nicolasroard [Tue, 23 Oct 2012 19:18:54 +0000 (12:18 -0700)]
Fix flickering in geometry panel
bug:
7344214
Change-Id: I34c980061c2d51e7b97ec95fc77e3331cffdf8d5
Bobby Georgescu [Tue, 23 Oct 2012 18:52:53 +0000 (11:52 -0700)]
am
c162c8b7: Merge "Show Panorama viewer button in filmstrip mode" into gb-ub-photos-arches
* commit '
c162c8b70b795e95ebe53154ddb86ecf188eade0':
Show Panorama viewer button in filmstrip mode
OSDN Git Service
