OSDN Git Service
Bobby Georgescu [Wed, 17 Oct 2012 05:59:25 +0000 (22:59 -0700)]
am
a88bd1ca: Merge "Update empty placeholder asset" into gb-ub-photos-arches
* commit '
a88bd1ca15dd7eafe4b018ef385097eabca18872':
Update empty placeholder asset
Bobby Georgescu [Wed, 17 Oct 2012 05:57:12 +0000 (22:57 -0700)]
Merge "Update empty placeholder asset" into gb-ub-photos-arches
Bobby Georgescu [Wed, 17 Oct 2012 05:41:58 +0000 (22:41 -0700)]
Update empty placeholder asset
Bug:
7362100
Change-Id: I521c1c481a00959bb50d17fee3be6981be84a269
Bobby Georgescu [Wed, 17 Oct 2012 04:41:47 +0000 (21:41 -0700)]
am
a05bf471: Merge "Update Camera album overlay icon asset" into gb-ub-photos-arches
* commit '
a05bf4719abc1b16c997b2012b14fc3d4d4d0c20':
Update Camera album overlay icon asset
Bobby Georgescu [Wed, 17 Oct 2012 04:39:42 +0000 (21:39 -0700)]
Merge "Update Camera album overlay icon asset" into gb-ub-photos-arches
Bobby Georgescu [Wed, 17 Oct 2012 04:35:23 +0000 (21:35 -0700)]
Update Camera album overlay icon asset
Bug:
7332688
Change-Id: Id7ada222551187787c4e3b50f52dcdc5c6c70929
Bobby Georgescu [Wed, 17 Oct 2012 04:25:19 +0000 (21:25 -0700)]
am
e20cc0cb: Add blue highlight when tapping 360 panorama button
* commit '
e20cc0cb9f21236342c7bdfa2ffbf66ea8036b1d':
Add blue highlight when tapping 360 panorama button
Bobby Georgescu [Wed, 17 Oct 2012 04:06:28 +0000 (21:06 -0700)]
Add blue highlight when tapping 360 panorama button
Bug:
7336676
Change-Id: If16e5aacf1102d0bd7de7ce5d6c90efae4c786f7
Bobby Georgescu [Wed, 17 Oct 2012 01:18:46 +0000 (18:18 -0700)]
am
74d5dfd6: Merge "Consistent animations & up button behavior in Gallery" into gb-ub-photos-arches
* commit '
74d5dfd662b92c9ce1aee225291b9d1775cfb49e':
Consistent animations & up button behavior in Gallery
Bobby Georgescu [Wed, 17 Oct 2012 01:17:16 +0000 (18:17 -0700)]
Merge "Consistent animations & up button behavior in Gallery" into gb-ub-photos-arches
John Reck [Wed, 17 Oct 2012 00:45:15 +0000 (17:45 -0700)]
am
2b543897: Merge "Add hook to manipulate SurfaceTexture transform" into gb-ub-photos-arches
* commit '
2b543897e077ee4803fa60b6fd7a6a604835b0b3':
Add hook to manipulate SurfaceTexture transform
John Reck [Wed, 17 Oct 2012 00:42:32 +0000 (17:42 -0700)]
Merge "Add hook to manipulate SurfaceTexture transform" into gb-ub-photos-arches
John Reck [Wed, 17 Oct 2012 00:06:13 +0000 (17:06 -0700)]
Add hook to manipulate SurfaceTexture transform
Bug:
7302956
Change-Id: I32bdeb22630dbeba9f028e1c68167d10a5288a28
Bobby Georgescu [Mon, 15 Oct 2012 20:48:08 +0000 (13:48 -0700)]
Consistent animations & up button behavior in Gallery
Bug:
7302857
Bug:
7295464
This CL makes all of the transition animations throughout
the Gallery app consistent. The animation is the previous
view shrinking and fading out while the new view starts out
bigger than the view port and is coming in to the viewport
size as it fades in. Having consistent animations allows us
to not keep PhotoPage/AlbumPage instances around in certain
cases, making it possible to have consistent up button
behavior when switching between the grid and filmstrip.
Finally, this also makes the transitions in the camera app
filmstrip/grid switching consistent with those in the
gallery app.
Change-Id: I77bac6a0cde1e439738c78f9e16ab15ed5910cfb
nicolasroard [Tue, 16 Oct 2012 21:58:03 +0000 (14:58 -0700)]
am
e34a5a5e: Fix when we cannot load an image
* commit '
e34a5a5eaedb870798a5cc7415079d04a6ca42e0':
Fix when we cannot load an image
nicolasroard [Tue, 16 Oct 2012 21:25:09 +0000 (14:25 -0700)]
Fix when we cannot load an image
bug:
7321636
Change-Id: I82cd603d531a1b743737a7c5b65005d370f2cdb1
John Hoford [Tue, 16 Oct 2012 20:51:03 +0000 (13:51 -0700)]
am
20fb632c: prevent original now acts like any other FX filter
* commit '
20fb632c407a2dfb5ec769560c61deacc77b8764':
prevent original now acts like any other FX filter
John Hoford [Tue, 16 Oct 2012 19:39:29 +0000 (12:39 -0700)]
prevent original now acts like any other FX filter
bug:
7353358
Change-Id: Id4efa45ddb8a8a0ca6d201ffc0b45fdd2f3caabf
nicolasroard [Tue, 16 Oct 2012 20:16:44 +0000 (13:16 -0700)]
am
374c3c8b: Merge "Fix curves tool" into gb-ub-photos-arches
* commit '
374c3c8bac97c149cdfd185b9fd76fbe069ae6db':
Fix curves tool
nicolasroard [Tue, 16 Oct 2012 20:14:38 +0000 (13:14 -0700)]
Merge "Fix curves tool" into gb-ub-photos-arches
nicolasroard [Tue, 16 Oct 2012 01:03:37 +0000 (18:03 -0700)]
Fix curves tool
bug:
7344301
bug:
7328680
bug:
7289525
bug:
7234239
Change-Id: I78d09dc2b38b11ccb2aac38ceef3acd8041f245e
Doris Liu [Tue, 16 Oct 2012 19:52:29 +0000 (12:52 -0700)]
am
b7a0b092: Make save button in video trimming consistent
* commit '
b7a0b0926258acc67c9d447c880b9ae8be96333d':
Make save button in video trimming consistent
Doris Liu [Tue, 16 Oct 2012 18:18:58 +0000 (11:18 -0700)]
Make save button in video trimming consistent
Bug:
7353884
Updated save button icon and text
Save button in video trimming now acts like back button when no change
has been made.
Change-Id: Iec29315222d3f3ffac9b96a89cad2821d7f86c4f
Doris Liu [Tue, 16 Oct 2012 18:24:42 +0000 (11:24 -0700)]
am
ea3c037a: Merge "Update save button in photo editor" into gb-ub-photos-arches
* commit '
ea3c037a82c31734bcea1f5c74da5904882df193':
Update save button in photo editor
Doris Liu [Tue, 16 Oct 2012 18:23:50 +0000 (11:23 -0700)]
Merge "Update save button in photo editor" into gb-ub-photos-arches
Doris Liu [Tue, 16 Oct 2012 17:27:58 +0000 (10:27 -0700)]
Update save button in photo editor
Bug:
7346315
Change-Id: I64e663b3a12c19db280855282722883f6866176e
John Hoford [Tue, 16 Oct 2012 18:02:27 +0000 (11:02 -0700)]
am
b9c316af: Merge "filters now support orientation" into gb-ub-photos-arches
* commit '
b9c316af94f66bd708d40306e4920ae009795d4b':
filters now support orientation
John Hoford [Tue, 16 Oct 2012 18:00:35 +0000 (11:00 -0700)]
Merge "filters now support orientation" into gb-ub-photos-arches
John Hoford [Tue, 16 Oct 2012 17:41:40 +0000 (10:41 -0700)]
filters now support orientation
bug:
7353416
Change-Id: Ie6f01f37428dc86d338c5cb5a80630aa3a879eaa
Chris Craik [Tue, 16 Oct 2012 17:32:02 +0000 (10:32 -0700)]
am
c7d90032: Merge "Correct toast text for clarity" into gb-ub-photos-arches
* commit '
c7d90032c8ea9fd73634c311ed0ba9d5128fe861':
Correct toast text for clarity
Chris Craik [Tue, 16 Oct 2012 17:29:29 +0000 (10:29 -0700)]
Merge "Correct toast text for clarity" into gb-ub-photos-arches
Chris Craik [Tue, 16 Oct 2012 01:52:52 +0000 (18:52 -0700)]
Correct toast text for clarity
bug:
7353760
Makes the English string better, but should still be a format string.
Change-Id: If998aab71d8f859911df6c7b332e908dcb43afc2
Wu-cheng Li [Tue, 16 Oct 2012 07:16:52 +0000 (00:16 -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:12 +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:22:56 +0000 (19:22 -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:21 +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:56 +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:09 +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
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:17 +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:10:26 +0000 (18:10 -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:36:28 +0000 (19:36 -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
John Hoford [Fri, 12 Oct 2012 22:17:32 +0000 (15:17 -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:21 +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:11 +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:10:24 +0000 (11:10 -0700)]
am
43b6cf3a: (-s ours) Import translations. DO NOT MERGE
* commit '
43b6cf3abce288ee5f26ebe4a904e0ef2b5041c6':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 12 Oct 2012 17:45:43 +0000 (10:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8156611841adfcbfce2f04ac8f3fa4db6ce613f6
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:30:29 +0000 (10:30 -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:25:26 +0000 (09:25 -0700)]
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:23 +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:29:56 +0000 (23:29 -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:34 +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:33:48 +0000 (21:33 -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:37 +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:29 +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:02:17 +0000 (21:02 -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:16:57 +0000 (20:16 -0700)]
am
e533f659: Fixes Rotate, Flip, Straighten tools.
* commit '
e533f65961ed601ded1803caeab6cef0a778d2f2':
Fixes Rotate, Flip, Straighten tools.
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
Hung-ying Tyan [Fri, 12 Oct 2012 00:57:46 +0000 (17:57 -0700)]
Merge "Use exiftool as ground truth for Exif API test" into gb-ub-photos-bryce
Baligh Uddin [Fri, 12 Oct 2012 00:30:53 +0000 (17:30 -0700)]
am
ecaa3f54: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
ecaa3f5474782f8333328fb312f464c56b3b73dc':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 12 Oct 2012 00:29:41 +0000 (17:29 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
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:27:42 +0000 (17:27 -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
OSDN Git Service
