OSDN Git Service
Wu-cheng Li [Tue, 16 Oct 2012 07:17:08 +0000 (00:17 -0700)]
am
84440670: Remove old camera classes.
* commit '
84440670da46866867ace3be2c358a54db984a6d':
Remove old camera classes.
Wu-cheng Li [Sun, 14 Oct 2012 13:28:31 +0000 (21:28 +0800)]
Remove old camera classes.
bug:
7201108
Change-Id: I539d02c411c654238d7e5e0c34e9ec3e6e6d4d90
Owen Lin [Tue, 16 Oct 2012 02:41:17 +0000 (19:41 -0700)]
am
030f8dad: Fixes bugs in TiledTexture.
* commit '
030f8dad6aefc42d0af39bc1b93f370937d3e2ab':
Fixes bugs in TiledTexture.
Owen Lin [Thu, 11 Oct 2012 07:50:38 +0000 (15:50 +0800)]
Fixes bugs in TiledTexture.
1. Upload tiles in SinglePhotoDataAdapter
2. Rebuild the upload queue after the screen nails being recycled
bug:
6399444
Change-Id: I57e756f8d1d84742bf82dd34c83baf8df89ae4cc
Owen Lin [Tue, 16 Oct 2012 02:23:04 +0000 (19:23 -0700)]
am
ff025412: Merge "Revert "Revert "Upload screennails in tiles to prevent jank""" into gb-ub-photos-arches
* commit '
ff025412e2cacedd8cbb7901140e580f76634ee6':
Revert "Revert "Upload screennails in tiles to prevent jank""
Owen Lin [Tue, 16 Oct 2012 02:20:57 +0000 (19:20 -0700)]
Merge "Revert "Revert "Upload screennails in tiles to prevent jank""" into gb-ub-photos-arches
John Reck [Tue, 16 Oct 2012 00:10:37 +0000 (17:10 -0700)]
am
a38801ed: Merge "Fix build" into gb-ub-photos-arches
* commit '
a38801edd3a39d888bf36607b567171f8b9527ad':
Fix build
John Reck [Tue, 16 Oct 2012 00:09:04 +0000 (17:09 -0700)]
Merge "Fix build" into gb-ub-photos-arches
John Reck [Tue, 16 Oct 2012 00:08:10 +0000 (17:08 -0700)]
Fix build
Change-Id: Ic7bb61c463d237f9ee5fabc8e7f7325ecf1da43c
John Hoford [Mon, 15 Oct 2012 23:54:20 +0000 (16:54 -0700)]
am
80789c08: Merge "fix for the cache" into gb-ub-photos-arches
* commit '
80789c089e8795968426838ff9c1e71c84cfee6f':
fix for the cache
John Hoford [Mon, 15 Oct 2012 23:52:53 +0000 (16:52 -0700)]
Merge "fix for the cache" into gb-ub-photos-arches
John Hoford [Mon, 15 Oct 2012 22:51:02 +0000 (15:51 -0700)]
fix for the cache
Change-Id: Ib5c82aa602df961d15064e732b3701c8d6cd66ff
bug:
7345592
Mangesh Ghiware [Mon, 15 Oct 2012 23:43:55 +0000 (16:43 -0700)]
am
c42bb220: Merge "Cherry-pick of
092fd92 to fix bug
7344730 also." into gb-ub-photos-arches
* commit '
c42bb220434926c23332c0f93baad4ca2c6b7588':
Cherry-pick of
092fd92 to fix bug
7344730 also.
Mangesh Ghiware [Mon, 15 Oct 2012 23:42:17 +0000 (16:42 -0700)]
Merge "Cherry-pick of
092fd92 to fix bug
7344730 also." into gb-ub-photos-arches
John Reck [Mon, 15 Oct 2012 23:40:45 +0000 (16:40 -0700)]
am
b1a28418: Fix SRI Pano orientation
* commit '
b1a28418848ce0adeb8a845a78e246b01913d176':
Fix SRI Pano orientation
John Reck [Mon, 15 Oct 2012 23:11:04 +0000 (16:11 -0700)]
Fix SRI Pano orientation
Bug:
7345511
Change-Id: I9a06f03b67ba820b86520588415ff3ab16f05829
Chih-Chung Chang [Fri, 12 Oct 2012 10:54:06 +0000 (18:54 +0800)]
Cherry-pick of
092fd92 to fix bug
7344730 also.
Make getSupportedOperations() call getSupportedOperations(boolean) by default.
So things will work for MediaObject who doesn't override the new method.
Bug:
7336562
Change-Id: Ic9ed6211981bb91c56702eafa7b21e83ed071cef
Wu-cheng Li [Mon, 15 Oct 2012 16:05:14 +0000 (09:05 -0700)]
am
f034e3d9: Update the assets of unlock and camera icons in filmstrip.
* commit '
f034e3d9b5d72ebea44d4928fb449a4cf239c3e1':
Update the assets of unlock and camera icons in filmstrip.
Wu-cheng Li [Mon, 15 Oct 2012 10:20:32 +0000 (18:20 +0800)]
Update the assets of unlock and camera icons in filmstrip.
bug:
7318891
Change-Id: Ia74e8a78aa712432cd8a87b061c609cce223cf37
Jason Chen [Mon, 15 Oct 2012 06:01:15 +0000 (23:01 -0700)]
Merge "Let's enhance." into jb-mr1-dev
Wu-cheng Li [Mon, 15 Oct 2012 05:35:26 +0000 (22:35 -0700)]
am
7f1ad54d: Merge "Add stitching panorama image to secure album." into gb-ub-photos-arches
* commit '
7f1ad54dc6516d7b5cd7d5cabc6b96346186fce8':
Add stitching panorama image to secure album.
Wu-cheng Li [Mon, 15 Oct 2012 05:34:06 +0000 (22:34 -0700)]
Merge "Add stitching panorama image to secure album." into gb-ub-photos-arches
nicolasroard [Sun, 14 Oct 2012 02:25:38 +0000 (19:25 -0700)]
am
5ec40a6b: Fix dimensions to use dips instead of pixels
* commit '
5ec40a6ba587fa8bd50958d263bb6fc6280de4c1':
Fix dimensions to use dips instead of pixels
nicolasroard [Sun, 14 Oct 2012 01:38:51 +0000 (18:38 -0700)]
Fix dimensions to use dips instead of pixels
bug:
7343798
Change-Id: I3d576ae334e580ad9da5b56d4ae84f749004ec21
nicolasroard [Sun, 14 Oct 2012 01:09:53 +0000 (18:09 -0700)]
am
b470b229: Fix cropping and saving issues
* commit '
b470b229fbfd782db6758f331e4a6f918e305b02':
Fix cropping and saving issues
nicolasroard [Sun, 14 Oct 2012 00:24:31 +0000 (17:24 -0700)]
Fix cropping and saving issues
bug:
7342359
Change-Id: Ia59eb3f423b8c4f420b7b6f120735856a84cd854
Wu-cheng Li [Sat, 13 Oct 2012 07:07:27 +0000 (15:07 +0800)]
Add stitching panorama image to secure album.
bug:
7285105
Change-Id: I9f609f30d817f10a6c9c94fc6eadb58bc1bdd580
Bobby Georgescu [Sat, 13 Oct 2012 02:37:01 +0000 (19:37 -0700)]
am
48b63eec: Merge "Hide Camera button on empty gallery when not available" into gb-ub-photos-arches
* commit '
48b63eecbc15ff6ec7e152076262c7dab26e5a6f':
Hide Camera button on empty gallery when not available
Bobby Georgescu [Sat, 13 Oct 2012 02:35:21 +0000 (19:35 -0700)]
Merge "Hide Camera button on empty gallery when not available" into gb-ub-photos-arches
Bobby Georgescu [Sat, 13 Oct 2012 01:00:51 +0000 (18:00 -0700)]
Hide Camera button on empty gallery when not available
Bug:
7342583
Change-Id: I545b6902f994f7ed0245ec486e78693aea197a4a
Jason Chen [Fri, 12 Oct 2012 17:42:06 +0000 (10:42 -0700)]
Let's enhance.
Add mipmap-xxhdpi launcher icon asset.
Bug:
6718166
Change-Id: Iedb9a380fc6b1e7045bed84164792f8a51ddcd01
John Hoford [Fri, 12 Oct 2012 22:18:06 +0000 (15:18 -0700)]
John Hoford [Fri, 12 Oct 2012 22:07:49 +0000 (15:07 -0700)]
Icon fix
bug:
7328726
Change-Id: I9042c1de718b316e92bcc44700a514542af6dd65
Bobby Georgescu [Fri, 12 Oct 2012 21:09:56 +0000 (14:09 -0700)]
am
1d2e9903: Merge "Improve performance of filmstrip" into gb-ub-photos-arches
* commit '
1d2e9903ab31dd88a8a7370d6e1faf4e9ed204bb':
Improve performance of filmstrip
Bobby Georgescu [Fri, 12 Oct 2012 21:08:03 +0000 (14:08 -0700)]
Merge "Improve performance of filmstrip" into gb-ub-photos-arches
Ruben Brunk [Fri, 12 Oct 2012 21:04:46 +0000 (14:04 -0700)]
am
7776408c: Merge "Adding crop UI. Fixes a number of other UI bugs." into gb-ub-photos-arches
* commit '
7776408c5bbd4bb2669b7a577d157dc1967e434e':
Adding crop UI. Fixes a number of other UI bugs.
Ruben Brunk [Fri, 12 Oct 2012 21:02:27 +0000 (14:02 -0700)]
Merge "Adding crop UI. Fixes a number of other UI bugs." into gb-ub-photos-arches
Ruben Brunk [Fri, 12 Oct 2012 12:52:06 +0000 (05:52 -0700)]
Adding crop UI. Fixes a number of other UI bugs.
Bug:
7337191
Change-Id: If63dbdac6722ad4fc6c30c165d6c2eeb7011c240
Bobby Georgescu [Fri, 12 Oct 2012 00:53:22 +0000 (17:53 -0700)]
Improve performance of filmstrip
Bug:
7336758
Change-Id: I22dbf2e75bc069341a9bbc2c4dcdf7750f23be7f
Baligh Uddin [Fri, 12 Oct 2012 18:09:47 +0000 (11:09 -0700)]
am
43b6cf3a: (-s ours) Import translations. DO NOT MERGE
* commit '
43b6cf3abce288ee5f26ebe4a904e0ef2b5041c6':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 12 Oct 2012 17:46:29 +0000 (10:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: If09e8be1fb2f230b36982826c27e61dc5a26924f
Auto-generated-cl: translation import
Baligh Uddin [Fri, 12 Oct 2012 17:45:20 +0000 (10:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: I130961bb83f07b45368b3d77f99c9cb6f84fe96e
Auto-generated-cl: translation import
Ruben Brunk [Fri, 12 Oct 2012 17:29:54 +0000 (10:29 -0700)]
am
4247c232: Merge "Moves matrix function to GeometryMetadata. Fixes scaling issues." into gb-ub-photos-arches
* commit '
4247c2325851501cb7f4b72ea4a4b84abc0e6da7':
Moves matrix function to GeometryMetadata. Fixes scaling issues.
Ruben Brunk [Fri, 12 Oct 2012 17:28:22 +0000 (10:28 -0700)]
Merge "Moves matrix function to GeometryMetadata. Fixes scaling issues." into gb-ub-photos-arches
Ruben Brunk [Fri, 12 Oct 2012 09:03:18 +0000 (02:03 -0700)]
Moves matrix function to GeometryMetadata. Fixes scaling issues.
Bug:
7337191
Change-Id: Icfd50c8a07ef02f2346a8ab7b57303de3866d74d
nicolasroard [Fri, 12 Oct 2012 16:26:11 +0000 (09:26 -0700)]
Chih-Chung Chang [Fri, 12 Oct 2012 11:20:42 +0000 (04:20 -0700)]
Merge "Make getSupportedOperations() call getSupportedOperations(boolean) by default." into jb-mr1-dev
Chih-Chung Chang [Fri, 12 Oct 2012 10:54:06 +0000 (18:54 +0800)]
Make getSupportedOperations() call getSupportedOperations(boolean) by default.
So things will work for MediaObject who doesn't override the new method.
Bug:
7336562
Change-Id: Ic9ed6211981bb91c56702eafa7b21e83ed071cef
nicolasroard [Fri, 12 Oct 2012 08:16:31 +0000 (01:16 -0700)]
Fix XML layout
bug:
7302553
Change-Id: Id889c9c4ac083b85f5d85e316aee6a10bb4bbbd0
nicolasroard [Fri, 12 Oct 2012 07:59:46 +0000 (00:59 -0700)]
am
808dbe19: Merge "Add back button handling" into gb-ub-photos-arches
* commit '
808dbe19752361ad171b58836df7f195deee8019':
Add back button handling
nicolasroard [Fri, 12 Oct 2012 07:58:04 +0000 (00:58 -0700)]
Merge "Add back button handling" into gb-ub-photos-arches
nicolasroard [Fri, 12 Oct 2012 07:18:51 +0000 (00:18 -0700)]
Add back button handling
bug:
7332980
- fix crash as well.
Change-Id: Id93ee7c194df6ac5e38def2e5f0fb3c5ecc0c2e4
Mangesh Ghiware [Fri, 12 Oct 2012 06:30:07 +0000 (23:30 -0700)]
am
423e45e4: Refresh panorama image after stitching completion
* commit '
423e45e492d4ebdc41ecfeba73299de23b1463c4':
Refresh panorama image after stitching completion
Mangesh Ghiware [Fri, 12 Oct 2012 06:11:27 +0000 (23:11 -0700)]
Refresh panorama image after stitching completion
Bug:
7336784
Updating photo refreshes the supported operations which indiate if said
MediaItem is a panorama or not.
Change-Id: If3a169c9256b3f898594a30740930b5dfd96dba0
nicolasroard [Fri, 12 Oct 2012 05:38:46 +0000 (22:38 -0700)]
nicolasroard [Fri, 12 Oct 2012 04:36:12 +0000 (21:36 -0700)]
Fix UI
bug:
7328726
- add one pixel border
- hide parameter value on certain effects
- increase scale for border icons
Change-Id: Iffacec18477895701cba069500ee617bf3f9f2b7
John Hoford [Fri, 12 Oct 2012 04:34:01 +0000 (21:34 -0700)]
am
ea5df36a: layouts, image icons, and layer behavour
* commit '
ea5df36ac1cdfbb569e6ba725c2df433d614d0f5':
layouts, image icons, and layer behavour
John Hoford [Fri, 12 Oct 2012 04:04:41 +0000 (21:04 -0700)]
layouts, image icons, and layer behavour
bug:
7328726
Change-Id: I94300771dd7b6ff5b4196365f13320fbc4bdde92
Bart Sears [Fri, 12 Oct 2012 04:14:51 +0000 (21:14 -0700)]
am
7d161351: Adjust text on Apply button
* commit '
7d161351c5aac3f88eb61003d56f30275ad4a180':
Adjust text on Apply button
Bart Sears [Fri, 12 Oct 2012 03:34:21 +0000 (20:34 -0700)]
Adjust text on Apply button
ALL CAPS was a bit loud, so go back to mixed case, lower
font size to 18dip, and remove ":".
Bug:
7333492
Change-Id: I18885808437e6328ec94c40df25ea0678d381825
nicolasroard [Fri, 12 Oct 2012 04:11:43 +0000 (21:11 -0700)]
am
8985e064: Hide history panel for now
* commit '
8985e0647b6a2966e710a51d4f6001faf44b5ddc':
Hide history panel for now
nicolasroard [Fri, 12 Oct 2012 04:02:51 +0000 (21:02 -0700)]
Hide history panel for now
bug:
7325872
Change-Id: Ica442d50e797a8ae73f1ddf94daee02d907583d2
nicolasroard [Fri, 12 Oct 2012 04:01:33 +0000 (21:01 -0700)]
am
8e1536da: Add new borders
* commit '
8e1536da92f155731d5fd729ec5b2bf00709091a':
Add new borders
nicolasroard [Fri, 12 Oct 2012 03:17:44 +0000 (20:17 -0700)]
Add new borders
bug:
7233749
Change-Id: I34afe40f85c72491dac7b26ea4433ede96e09a0a
nicolasroard [Fri, 12 Oct 2012 03:17:18 +0000 (20:17 -0700)]
am
e533f659: Fixes Rotate, Flip, Straighten tools.
* commit '
e533f65961ed601ded1803caeab6cef0a778d2f2':
Fixes Rotate, Flip, Straighten tools.
Baligh Uddin [Fri, 12 Oct 2012 03:17:18 +0000 (20:17 -0700)]
am
ecaa3f54: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
ecaa3f5474782f8333328fb312f464c56b3b73dc':
Import translations. DO NOT MERGE
nicolasroard [Fri, 12 Oct 2012 01:12:09 +0000 (18:12 -0700)]
Fixes Rotate, Flip, Straighten tools.
bug:
7314849
Bug:
7224232
Bug:
7218935
Change-Id: I418287ff1f81c25f8e089821d823dc29ee62ff0e
Baligh Uddin [Fri, 12 Oct 2012 00:30:29 +0000 (17:30 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Fri, 12 Oct 2012 00:29:13 +0000 (17:29 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Ruben Brunk [Fri, 12 Oct 2012 00:28:17 +0000 (17:28 -0700)]
am
11a21df4: Merge "Fixed apply bar text. Moved strings to xml." into gb-ub-photos-arches
* commit '
11a21df4be6984a180e27b9915a9d6af7e7ef359':
Fixed apply bar text. Moved strings to xml.
Ruben Brunk [Fri, 12 Oct 2012 00:26:29 +0000 (17:26 -0700)]
Merge "Fixed apply bar text. Moved strings to xml." into gb-ub-photos-arches
Chris Craik [Fri, 12 Oct 2012 00:15:51 +0000 (17:15 -0700)]
am
8e9072b0: Merge "Alias com.android.camera.Camera to point at CameraActivity" into gb-ub-photos-arches
* commit '
8e9072b0a95d48caa8b1d9cdb9b385e92c33e292':
Alias com.android.camera.Camera to point at CameraActivity
Baligh Uddin [Fri, 12 Oct 2012 00:15:23 +0000 (17:15 -0700)]
Import translations. DO NOT MERGE
Change-Id: I05c99d9083d905ee1045c715a3e12389e1029f06
Auto-generated-cl: translation import
Baligh Uddin [Fri, 12 Oct 2012 00:14:06 +0000 (17:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8a906b470bbc7e5d15958962b6818732a85d37fb
Auto-generated-cl: translation import
Chris Craik [Fri, 12 Oct 2012 00:14:05 +0000 (17:14 -0700)]
Merge "Alias com.android.camera.Camera to point at CameraActivity" into gb-ub-photos-arches
John Hoford [Fri, 12 Oct 2012 00:10:38 +0000 (17:10 -0700)]
am
a4ccb4af: Merge "fixed manta image size and double FX issue" into gb-ub-photos-arches
* commit '
a4ccb4af475fbabf637dd48bf68db449ea7c8197':
fixed manta image size and double FX issue
John Hoford [Fri, 12 Oct 2012 00:09:39 +0000 (17:09 -0700)]
Merge "fixed manta image size and double FX issue" into gb-ub-photos-arches
Ruben Brunk [Thu, 11 Oct 2012 22:16:58 +0000 (15:16 -0700)]
Fixed apply bar text. Moved strings to xml.
Bug:
7333492
Change-Id: I650a7178e5351c98d0bf5808ccdf6c597a88dada
Michael Kolb [Thu, 11 Oct 2012 23:58:22 +0000 (16:58 -0700)]
am
310a93dc: Merge "Remove old 360 icons" into gb-ub-photos-arches
* commit '
310a93dc17574f3595b03da6988a2fbf3b382f51':
Remove old 360 icons
Michael Kolb [Thu, 11 Oct 2012 23:56:27 +0000 (16:56 -0700)]
Merge "Remove old 360 icons" into gb-ub-photos-arches
Sascha Haeberling [Thu, 11 Oct 2012 23:37:57 +0000 (16:37 -0700)]
am
93f074e4: Merge "Removing the disabled undo button." into gb-ub-photos-arches
* commit '
93f074e4672b81a5a4e38ea7ddebe3c916ccddfd':
Removing the disabled undo button.
Sascha Haeberling [Thu, 11 Oct 2012 23:36:05 +0000 (16:36 -0700)]
Merge "Removing the disabled undo button." into gb-ub-photos-arches
Chris Craik [Thu, 11 Oct 2012 21:06:45 +0000 (14:06 -0700)]
Alias com.android.camera.Camera to point at CameraActivity
bug:
7291128
Change-Id: Id6649024516ba79fa042284db95d29a37552eef4
Michael Kolb [Thu, 11 Oct 2012 23:26:00 +0000 (16:26 -0700)]
Remove old 360 icons
Bug:
7331839
Change-Id: Ie2de6336cd1c485ddacf51b6092c29f6feb9e4da
Sascha Haeberling [Thu, 11 Oct 2012 23:04:01 +0000 (16:04 -0700)]
Removing the disabled undo button.
Bug:
7333546
Addendum to http://go/ag//#/c/238167/
Change-Id: If39d93ffa9367ecd6b731c2c32ed0cab055000f4
Bobby Georgescu [Thu, 11 Oct 2012 23:01:32 +0000 (16:01 -0700)]
am
dd158691: Merge "Change ActionBar spinner text size on rotate" into gb-ub-photos-arches
* commit '
dd1586912b5da958b33a0d9f07312160d1cb103b':
Change ActionBar spinner text size on rotate
Bobby Georgescu [Thu, 11 Oct 2012 23:00:01 +0000 (16:00 -0700)]
Merge "Change ActionBar spinner text size on rotate" into gb-ub-photos-arches
Mangesh Ghiware [Thu, 11 Oct 2012 22:54:13 +0000 (15:54 -0700)]
am
825afb1b: Move calls to LightCycleHelper off the UI thread.
* commit '
825afb1b3e7d15b5c258d664ee008dc68da1c407':
Move calls to LightCycleHelper off the UI thread.
Mangesh Ghiware [Thu, 11 Oct 2012 01:37:24 +0000 (18:37 -0700)]
Move calls to LightCycleHelper off the UI thread.
Bug:
7320303
Replace multiple methods in LightCycleHelper with a single one that
returns relevant metadata.
Change-Id: Iaa75b3c1ccc8a5b724b253cec654b5b5acb4878e
Bobby Georgescu [Thu, 11 Oct 2012 21:49:09 +0000 (14:49 -0700)]
Change ActionBar spinner text size on rotate
Bug:
7333151
Update the grid/filmstrip spinner switch text to
look and behave like the text in the Gmail app, as
requested by UX.
Change-Id: If822b21899172a35402477868d4f146a8e00cfea
Doris Liu [Thu, 11 Oct 2012 22:04:43 +0000 (15:04 -0700)]
am
47df0d2f: Add more space between save icon and text
* commit '
47df0d2ffb68ae01ee7732b890c4510b8a167616':
Add more space between save icon and text
Doris Liu [Thu, 11 Oct 2012 21:51:13 +0000 (14:51 -0700)]
Add more space between save icon and text
Bug:
7333278
Change-Id: Ief263b9cecc3448b85d00c0e5fc05e8b80cc9bdd
John Hoford [Thu, 11 Oct 2012 19:55:05 +0000 (12:55 -0700)]
fixed manta image size and double FX issue
bug:
7328636
Change-Id: I572255c65fb2d461dce6f52d056be6b3c4d987f6
George Mount [Thu, 11 Oct 2012 17:35:42 +0000 (10:35 -0700)]
am
37a93336: Merge "Clear cached stitching preview thumbnails." into gb-ub-photos-arches
* commit '
37a9333651cead185d982d9b809cb3425a24d3d8':
Clear cached stitching preview thumbnails.
George Mount [Thu, 11 Oct 2012 17:35:01 +0000 (10:35 -0700)]
Merge "Clear cached stitching preview thumbnails." into gb-ub-photos-arches
Bobby Georgescu [Thu, 11 Oct 2012 17:19:30 +0000 (10:19 -0700)]
am
bebc94be: Merge "Fix size of peripheral items when first opening filmstrip" into gb-ub-photos-arches
* commit '
bebc94be08667b474587592169155e6cb9855e77':
Fix size of peripheral items when first opening filmstrip
Bobby Georgescu [Thu, 11 Oct 2012 17:17:40 +0000 (10:17 -0700)]
Merge "Fix size of peripheral items when first opening filmstrip" into gb-ub-photos-arches
Baligh Uddin [Thu, 11 Oct 2012 17:13:36 +0000 (10:13 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
John Hoford [Thu, 11 Oct 2012 17:13:21 +0000 (10:13 -0700)]
am
7f34a6a5: Merge "Fix application of FX to not wipe out borders etc." into gb-ub-photos-arches
* commit '
7f34a6a5f21209c22584680f280723584e2c28e7':
Fix application of FX to not wipe out borders etc.
John Hoford [Thu, 11 Oct 2012 17:11:57 +0000 (10:11 -0700)]
Merge "Fix application of FX to not wipe out borders etc." into gb-ub-photos-arches
OSDN Git Service
