OSDN Git Service
Chad Jones [Sat, 20 Apr 2013 04:17:52 +0000 (21:17 -0700)]
Merge commit '
91d26f6c' into jb-mr2-dev
John Hoford [Fri, 19 Apr 2013 01:43:29 +0000 (18:43 -0700)]
tiny planet fix
bug:
8323524
Change-Id: I39283face7079574dbe25e797323a84141930f9a
John Reck [Fri, 19 Apr 2013 21:51:57 +0000 (21:51 +0000)]
Merge "Remove photos from gallery2 manifest" into gb-ub-photos-bryce
Michael Kolb [Fri, 19 Apr 2013 21:15:07 +0000 (14:15 -0700)]
am
beba6b1c: Merge "Fix labels" into gb-ub-photos-bryce
* commit '
beba6b1c36f79aded98f71dbf45454dd947ce7b8':
Fix labels
John Reck [Fri, 19 Apr 2013 17:04:12 +0000 (10:04 -0700)]
Remove photos from gallery2 manifest
Bug:
8659787
Change-Id: I72c85db38b3f7409a2ce84b2a6a7b7ccab41a351
Michael Kolb [Fri, 19 Apr 2013 21:11:59 +0000 (21:11 +0000)]
Merge "Fix labels" into gb-ub-photos-bryce
Michael Kolb [Fri, 19 Apr 2013 21:04:01 +0000 (14:04 -0700)]
Fix labels
Bug:
8660834
Change-Id: I92efdfb136fd57fabe30547f6cd1eb8abf94bf1a
Angus Kong [Fri, 19 Apr 2013 21:04:00 +0000 (14:04 -0700)]
am
935d4c80: Merge "Make MediaSaveService destroyed after unbound." into gb-ub-photos-bryce
* commit '
935d4c8037d7b5f56e4dea1c96bd8f4b68cb6236':
Make MediaSaveService destroyed after unbound.
Angus Kong [Fri, 19 Apr 2013 21:03:59 +0000 (14:03 -0700)]
am
ca3875b2: Merge "Save video using MediaSaveService." into gb-ub-photos-bryce
* commit '
ca3875b21375defd0d42c57c05994cd67f0d59cd':
Save video using MediaSaveService.
Angus Kong [Fri, 19 Apr 2013 21:01:35 +0000 (21:01 +0000)]
Merge "Make MediaSaveService destroyed after unbound." into gb-ub-photos-bryce
Angus Kong [Fri, 19 Apr 2013 21:01:15 +0000 (21:01 +0000)]
Merge "Save video using MediaSaveService." into gb-ub-photos-bryce
Bobby Georgescu [Fri, 19 Apr 2013 19:47:41 +0000 (12:47 -0700)]
am
faf2f040: Fix multi selection issue
* commit '
faf2f040f38532213fa237cf45c9794cf1a85859':
Fix multi selection issue
Angus Kong [Wed, 17 Apr 2013 22:37:07 +0000 (15:37 -0700)]
Save video using MediaSaveService.
bug:
8511719
Change-Id: I3fc5054bf7661953181b27e66cc70ba95082d36c
Angus Kong [Fri, 19 Apr 2013 19:28:58 +0000 (12:28 -0700)]
Make MediaSaveService destroyed after unbound.
bug:
8528779
Change-Id: I1e6b78d5603b10cde3399969cd7a8cc19655051b
Bobby Georgescu [Fri, 19 Apr 2013 18:27:29 +0000 (11:27 -0700)]
Fix multi selection issue
Bug:
8663155
Change-Id: Ic6aa98c04b5134df9deb1b14736e614bf1618f03
Michael Kolb [Fri, 19 Apr 2013 17:38:00 +0000 (10:38 -0700)]
am
32049103: Merge "Lock camera orientation using FW API" into gb-ub-photos-bryce
* commit '
32049103305c99e8be1f7af3e46933277e02a7c3':
Lock camera orientation using FW API
Michael Kolb [Fri, 19 Apr 2013 17:34:08 +0000 (17:34 +0000)]
Merge "Lock camera orientation using FW API" into gb-ub-photos-bryce
Angus Kong [Fri, 19 Apr 2013 17:27:38 +0000 (10:27 -0700)]
am
45826e18: Merge "Pass the camera to recorders after all is set." into gb-ub-photos-bryce
* commit '
45826e188598cd6171fc0ec3112e2fbf52fbc952':
Pass the camera to recorders after all is set.
Angus Kong [Fri, 19 Apr 2013 17:25:58 +0000 (17:25 +0000)]
Merge "Pass the camera to recorders after all is set." into gb-ub-photos-bryce
Doris Liu [Fri, 19 Apr 2013 17:20:32 +0000 (10:20 -0700)]
am
b1051814: Merge "Fix memory leak in pie controller" into gb-ub-photos-bryce
* commit '
b10518142bb84abe2ffe1bd3aa10ff4ee7982370':
Fix memory leak in pie controller
Doris Liu [Fri, 19 Apr 2013 17:20:31 +0000 (10:20 -0700)]
am
14fe2887: Merge "Allow swiping to filmstrip from blocker bar" into gb-ub-photos-bryce
* commit '
14fe288784c574c84edbf84306329dc8b70d8b4d':
Allow swiping to filmstrip from blocker bar
Doris Liu [Fri, 19 Apr 2013 17:17:59 +0000 (17:17 +0000)]
Merge "Fix memory leak in pie controller" into gb-ub-photos-bryce
Doris Liu [Fri, 19 Apr 2013 17:17:44 +0000 (17:17 +0000)]
Merge "Allow swiping to filmstrip from blocker bar" into gb-ub-photos-bryce
Michael Kolb [Fri, 19 Apr 2013 17:11:24 +0000 (10:11 -0700)]
am
a7e098c8: Merge "Drop in new assets of correct size" into gb-ub-photos-bryce
* commit '
a7e098c8e798160fdc2410867ec7eba325b7cd96':
Drop in new assets of correct size
Michael Kolb [Fri, 19 Apr 2013 17:09:40 +0000 (17:09 +0000)]
Merge "Drop in new assets of correct size" into gb-ub-photos-bryce
Michael Kolb [Fri, 19 Apr 2013 15:56:07 +0000 (08:56 -0700)]
Drop in new assets of correct size
Bug:
8640131
Change-Id: Iefcff08ae190c07700b5526a6847b664fe1b51a7
Ruben Brunk [Fri, 19 Apr 2013 03:20:19 +0000 (20:20 -0700)]
am
316af8dd: Merge "Fix crop activity aspect ratio and orientation handling." into gb-ub-photos-bryce
* commit '
316af8dd675d777f4bd9512b8af5391c7c89363f':
Fix crop activity aspect ratio and orientation handling.
Ruben Brunk [Fri, 19 Apr 2013 03:16:53 +0000 (03:16 +0000)]
Merge "Fix crop activity aspect ratio and orientation handling." into gb-ub-photos-bryce
John Hoford [Fri, 19 Apr 2013 01:44:01 +0000 (18:44 -0700)]
am
a1939d22: Merge "fixed borders issues" into gb-ub-photos-bryce
* commit '
a1939d22f631ddcb7e942cc0ad2ffa7ef78b763f':
fixed borders issues
John Hoford [Fri, 19 Apr 2013 01:41:44 +0000 (01:41 +0000)]
Merge "fixed borders issues" into gb-ub-photos-bryce
Doris Liu [Fri, 19 Apr 2013 00:14:51 +0000 (17:14 -0700)]
Fix memory leak in pie controller
Bug:
7622218
Change-Id: Iaab96008a4f4b506bb0be98f489af9120d607251
Ruben Brunk [Thu, 18 Apr 2013 23:22:27 +0000 (16:22 -0700)]
Fix crop activity aspect ratio and orientation handling.
Bug:
8659064
Bug:
8647628
Change-Id: I3e4293cc3bba7d55334acb396e20a23cc92f8f82
Flavio Lerda [Thu, 18 Apr 2013 23:00:40 +0000 (16:00 -0700)]
am
ed2f1790: Merge "Remove unused imports." into gb-ub-photos-bryce
* commit '
ed2f17903bbbca08ac98af4aa6c1dd9d22504a1d':
Remove unused imports.
Angus Kong [Thu, 18 Apr 2013 22:57:08 +0000 (15:57 -0700)]
Pass the camera to recorders after all is set.
bug:
8049369
Change-Id: I5cd658e78905a7b41f97ee0cce820f0c8bc99dd5
Flavio Lerda [Thu, 18 Apr 2013 22:57:36 +0000 (22:57 +0000)]
Merge "Remove unused imports." into gb-ub-photos-bryce
Flavio Lerda [Thu, 18 Apr 2013 21:51:46 +0000 (22:51 +0100)]
Remove unused imports.
This is follow-up on the previous fix for b/
8433834, addressing reviewer
comments.
Bug:
8433834
Change-Id: I06f466704175a62d8febc5be471a2ca1f50e898d
Michael Kolb [Thu, 18 Apr 2013 22:20:30 +0000 (15:20 -0700)]
am
5b083f89: Add more menu options/icons
* commit '
5b083f89c9c87f8e19e0942d1d7c2de623e527be':
Add more menu options/icons
Michael Kolb [Thu, 18 Apr 2013 19:31:10 +0000 (12:31 -0700)]
Add more menu options/icons
Bug:
8640131
Added location and scene mode to secondary menu
Updated HDR icons
Change-Id: I5bed39a2ec037aecf67702d88f738befe61846d4
George Mount [Thu, 18 Apr 2013 21:23:11 +0000 (14:23 -0700)]
am
b726c83a: Merge "Change labels so that it doesn\'t clash with PanoUiLib." into gb-ub-photos-bryce
* commit '
b726c83ab60b0ec8e93cad9724857999b3bb8ec5':
Change labels so that it doesn't clash with PanoUiLib.
George Mount [Thu, 18 Apr 2013 21:20:31 +0000 (21:20 +0000)]
Merge "Change labels so that it doesn't clash with PanoUiLib." into gb-ub-photos-bryce
Doris Liu [Tue, 16 Apr 2013 16:50:56 +0000 (09:50 -0700)]
Allow swiping to filmstrip from blocker bar
Bug:
8607910
Change-Id: I69bfcf8d95d6071be7d65fbf433916740cbb655c
John Hoford [Thu, 18 Apr 2013 03:40:25 +0000 (20:40 -0700)]
fixed borders issues
bug:
8315216
Change-Id: I04d62984c70e7e514b8625e6a4b5ed9395137471
Ruben Brunk [Thu, 18 Apr 2013 18:40:49 +0000 (11:40 -0700)]
am
c3178ca4: Gallery crop uses new activity. Fixed image quality.
* commit '
c3178ca4daf7ed570f3432f3433959c208ecc105':
Gallery crop uses new activity. Fixed image quality.
Ruben Brunk [Tue, 16 Apr 2013 23:17:45 +0000 (16:17 -0700)]
Gallery crop uses new activity. Fixed image quality.
Bug:
8639287
Bug:
8617799
Bug:
8600483
Bug:
8586301
Bug:
8526929
Bug:
8181859
Bug:
7561681
Change-Id: Ib275b970931dd324e93d1629be75e5309c9dcb4e
George Mount [Thu, 18 Apr 2013 17:15:40 +0000 (10:15 -0700)]
Change labels so that it doesn't clash with PanoUiLib.
Bug
8401273
PanoUiLib is required for all Gallery Wolfie UI.
Change-Id: Icd58c5f4c03945c29f6bf3be286d2321abf2f63a
Baligh Uddin [Thu, 18 Apr 2013 14:41:32 +0000 (07:41 -0700)]
am
c54e3418: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
c54e3418578d1419ff3370fa4ee38bdd43397ce1':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 18 Apr 2013 14:41:31 +0000 (07:41 -0700)]
am
df9e8b91: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
df9e8b91919a3b0b2097dc63f708854d20183a16':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 18 Apr 2013 14:40:06 +0000 (14:40 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Thu, 18 Apr 2013 14:39:53 +0000 (14:39 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Thu, 18 Apr 2013 14:39:04 +0000 (14:39 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Thu, 18 Apr 2013 14:38:29 +0000 (14:38 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Flavio Lerda [Thu, 18 Apr 2013 13:22:14 +0000 (06:22 -0700)]
am
47f28614: Merge "Usage statistics for sharing." into gb-ub-photos-bryce
* commit '
47f28614605a19726d2ab81b90333ba718223b72':
Usage statistics for sharing.
Flavio Lerda [Thu, 18 Apr 2013 13:19:39 +0000 (13:19 +0000)]
Merge "Usage statistics for sharing." into gb-ub-photos-bryce
Ruben Brunk [Thu, 18 Apr 2013 02:51:45 +0000 (19:51 -0700)]
am
61f3f111: Remove call to superclass onTouch in curves.
* commit '
61f3f1113a5b4f8583fd9fcae4d24734617cae21':
Remove call to superclass onTouch in curves.
Ruben Brunk [Thu, 18 Apr 2013 01:55:53 +0000 (18:55 -0700)]
Remove call to superclass onTouch in curves.
Bug:
8523301
Change-Id: I0102a228c2d1b3199412c9897a9f1abdb4bcb41f
Ruben Brunk [Thu, 18 Apr 2013 01:52:20 +0000 (18:52 -0700)]
am
869cb048: Merge "Remove redeye filter." into gb-ub-photos-bryce
* commit '
869cb0484c1c9e77d089abe198817709d3e89eb9':
Remove redeye filter.
Sascha Haeberling [Thu, 18 Apr 2013 01:52:19 +0000 (18:52 -0700)]
am
49ee213f: Merge "Add method for returning SoundPool audio type." into gb-ub-photos-bryce
* commit '
49ee213fbb0f3434002693889bdae3e7c0d5b378':
Add method for returning SoundPool audio type.
Ruben Brunk [Thu, 18 Apr 2013 01:49:53 +0000 (01:49 +0000)]
Merge "Remove redeye filter." into gb-ub-photos-bryce
Sascha Haeberling [Thu, 18 Apr 2013 01:48:34 +0000 (01:48 +0000)]
Merge "Add method for returning SoundPool audio type." into gb-ub-photos-bryce
Ruben Brunk [Thu, 18 Apr 2013 01:39:27 +0000 (18:39 -0700)]
Remove redeye filter.
Bug:
8609003
Change-Id: I7f10e928fa775e5186146f06877dda34b3df699a
John Hoford [Thu, 18 Apr 2013 00:39:47 +0000 (17:39 -0700)]
am
12cd0222: Merge "improve pinch to zoom behavior" into gb-ub-photos-bryce
* commit '
12cd022273f14a64d9cdf79aa6a27feb099b9107':
improve pinch to zoom behavior
John Hoford [Thu, 18 Apr 2013 00:36:52 +0000 (00:36 +0000)]
Merge "improve pinch to zoom behavior" into gb-ub-photos-bryce
Michael Kolb [Thu, 18 Apr 2013 00:08:37 +0000 (17:08 -0700)]
am
1c7d2bc2: First part of asset drop
* commit '
1c7d2bc293a1ff824db768756d0309dfbc7f08d8':
First part of asset drop
Michael Kolb [Wed, 17 Apr 2013 23:01:32 +0000 (16:01 -0700)]
First part of asset drop
Bug:
8640131
Added new assets, updated front/back menu entry.
Change-Id: I9b007cde14eeb9f44706d99ea485e03ce1de9d53
John Hoford [Wed, 17 Apr 2013 20:35:03 +0000 (13:35 -0700)]
improve pinch to zoom behavior
bug:
8630925
Change-Id: Ica4c4ab83e726901a8e729056529aa8379cb52ae
Sascha Haeberling [Wed, 17 Apr 2013 21:55:44 +0000 (14:55 -0700)]
Add method for returning SoundPool audio type.
Bug:
7402245
Change-Id: Ib45ef78265a66d59f0b27473d9dfcdfa4624c8fa
Baligh Uddin [Wed, 17 Apr 2013 18:42:13 +0000 (11:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifa9719cff3e8c9694ae010df054468110d02130e
Auto-generated-cl: translation import
Baligh Uddin [Wed, 17 Apr 2013 18:41:51 +0000 (11:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: I40c3456be1b6c6cecda7cc3c8c819972c7e42c6b
Auto-generated-cl: translation import
Baligh Uddin [Wed, 17 Apr 2013 18:40:24 +0000 (11:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: I964583b655d810df84aff9b5462aeca7199ed1f1
Auto-generated-cl: translation import
Baligh Uddin [Wed, 17 Apr 2013 18:39:48 +0000 (11:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibddba812775d4c197ceab7640c2f1bfce26eb4b3
Auto-generated-cl: translation import
ztenghui [Wed, 17 Apr 2013 18:24:36 +0000 (11:24 -0700)]
am
75408cd3: Add accessibility to video player controller.
* commit '
75408cd38e7efe0755addcf3170932c8b3190bc1':
Add accessibility to video player controller.
ztenghui [Tue, 16 Apr 2013 20:52:07 +0000 (13:52 -0700)]
Add accessibility to video player controller.
bug:
5714277
cherry pick the Carlsbad CL:
https://googleplex-android-review.git.corp.google.com/#/c/297944/
Change-Id: If0de1ec250a211890e1914d89e8b61780542a675
Flavio Lerda [Tue, 16 Apr 2013 08:46:07 +0000 (09:46 +0100)]
Usage statistics for sharing.
Bug:
8433834
Change-Id: Iaec6150443258daa213395b6fb1e8d8d3e6123b3
nicolasroard [Wed, 17 Apr 2013 00:46:10 +0000 (17:46 -0700)]
am
83bd8d34: Remove History panel
* commit '
83bd8d346d295e4fe06212da957feb77ee23c04d':
Remove History panel
nicolasroard [Wed, 17 Apr 2013 00:09:20 +0000 (17:09 -0700)]
Remove History panel
Now that we have the state, history
is not that useful. For clarity's sake
we are removing it.
bug:
8620913
bug:
8503386
bug:
8324322
bug:
8324023
Change-Id: Ife86f3ab67c05d5781234496c7518866b506631b
Ruben Brunk [Wed, 17 Apr 2013 00:02:38 +0000 (17:02 -0700)]
am
113e0fbd: Merge "Shows final set of filters in UI." into gb-ub-photos-bryce
* commit '
113e0fbd251966629719f390e43b320b84751304':
Shows final set of filters in UI.
Ruben Brunk [Tue, 16 Apr 2013 23:59:56 +0000 (23:59 +0000)]
Merge "Shows final set of filters in UI." into gb-ub-photos-bryce
Ruben Brunk [Tue, 16 Apr 2013 23:25:31 +0000 (16:25 -0700)]
Shows final set of filters in UI.
Bug:
8609003
Change-Id: Id7530da3e11fb88a964b881ba8f8fad70b40bc23
Doris Liu [Tue, 16 Apr 2013 23:14:25 +0000 (16:14 -0700)]
am
953f109b: Merge "Fix face unlock failure" into gb-ub-photos-bryce
* commit '
953f109b688477b086281fe09074d3886ef87fba':
Fix face unlock failure
nicolasroard [Tue, 16 Apr 2013 23:14:24 +0000 (16:14 -0700)]
am
03332473: Make convertBitmap() protected so that Frames can use it.
* commit '
0333247337b910bb981c6ba17ca0cc76d5b614ff':
Make convertBitmap() protected so that Frames can use it.
Doris Liu [Tue, 16 Apr 2013 23:12:49 +0000 (23:12 +0000)]
Merge "Fix face unlock failure" into gb-ub-photos-bryce
nicolasroard [Tue, 16 Apr 2013 22:56:35 +0000 (15:56 -0700)]
Make convertBitmap() protected so that Frames can use it.
bug:
8633011
Change-Id: Ic731a1d906a6a388a22568f396111f8ca3b4475e
Doris Liu [Tue, 16 Apr 2013 22:54:42 +0000 (15:54 -0700)]
Fix face unlock failure
Bug:
7494156
Change-Id: I6c909e498305ff3e66efdeeb9fb5581ea8f51715
nicolasroard [Tue, 16 Apr 2013 22:44:05 +0000 (15:44 -0700)]
am
f3f0aae4: Merge "Remove the Simple Edit menu item in Gallery" into gb-ub-photos-bryce
* commit '
f3f0aae490911245ad6a5602b77b72f0546b93cc':
Remove the Simple Edit menu item in Gallery
nicolasroard [Tue, 16 Apr 2013 22:42:34 +0000 (22:42 +0000)]
Merge "Remove the Simple Edit menu item in Gallery" into gb-ub-photos-bryce
nicolasroard [Tue, 16 Apr 2013 20:46:34 +0000 (13:46 -0700)]
Remove the Simple Edit menu item in Gallery
bug:
8609003
Change-Id: Ida6bfec65bf4b78c7c1b64f759c750ef9255bb6c
Angus Kong [Tue, 16 Apr 2013 21:49:49 +0000 (14:49 -0700)]
am
bc02d7dc: Don\'t wait for Mosaic Renderer ready in UI thread.
* commit '
bc02d7dcb2e9716a1f1e297fef435c8b0275aafe':
Don't wait for Mosaic Renderer ready in UI thread.
Angus Kong [Tue, 16 Apr 2013 20:57:06 +0000 (13:57 -0700)]
Don't wait for Mosaic Renderer ready in UI thread.
bug:
8292711
Change-Id: Ic318c353fc420c0f7e573c74814757b79c798c5d
nicolasroard [Tue, 16 Apr 2013 20:23:19 +0000 (13:23 -0700)]
am
fb6a8e16: New state panel
* commit '
fb6a8e166f0a46d2a994a408b1679e3a67fdcb52':
New state panel
nicolasroard [Mon, 15 Apr 2013 21:41:00 +0000 (14:41 -0700)]
New state panel
bug:
8620913
bug:
8503386
Change-Id: I35c95103e3b5097df93fa3f48e5562a479915f06
Michael Kolb [Tue, 16 Apr 2013 00:29:14 +0000 (17:29 -0700)]
am
0786c387: Merge "Angle menu at edge of screen" into gb-ub-photos-bryce
* commit '
0786c387413d434438257697475cf743661df296':
Angle menu at edge of screen
Michael Kolb [Tue, 16 Apr 2013 00:26:16 +0000 (00:26 +0000)]
Merge "Angle menu at edge of screen" into gb-ub-photos-bryce
Michael Kolb [Wed, 10 Apr 2013 21:16:19 +0000 (14:16 -0700)]
Angle menu at edge of screen
Bug:
8618699
Adjust touch slices; adjust label position
Change-Id: I5bbf16fc570eb9801198847991395699de89ffa3
Angus Kong [Mon, 15 Apr 2013 22:33:42 +0000 (15:33 -0700)]
am
f7771f98: Use extra copy of parameters for concurrent access
* commit '
f7771f98aed9f253048af7dd8b2a143b9258c139':
Use extra copy of parameters for concurrent access
Angus Kong [Mon, 15 Apr 2013 19:11:15 +0000 (12:11 -0700)]
Use extra copy of parameters for concurrent access
bug:
8585306
Change-Id: I21b8915c53508e4820e46b49171149189cb6012e
Michael Kolb [Mon, 15 Apr 2013 18:35:52 +0000 (11:35 -0700)]
Lock camera orientation using FW API
Bug:
8617536
Change-Id: Id3a5ae777f6f87d24984cbca48202470651cd71c
Michael Kolb [Mon, 15 Apr 2013 20:30:02 +0000 (13:30 -0700)]
am
78991864: Merge "Also, add labels to video menu" into gb-ub-photos-bryce
* commit '
789918643e2b682e387435002b5b0c287f35b39b':
Also, add labels to video menu
Michael Kolb [Mon, 15 Apr 2013 20:27:45 +0000 (20:27 +0000)]
Merge "Also, add labels to video menu" into gb-ub-photos-bryce
Michael Kolb [Mon, 15 Apr 2013 20:17:27 +0000 (13:17 -0700)]
Also, add labels to video menu
Bug:
8618169
Change-Id: Ia933db79eccf2564c785a12c8c6551fa8eb1007c
Baligh Uddin [Mon, 15 Apr 2013 19:59:47 +0000 (12:59 -0700)]
am
a8de1aa5: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
a8de1aa5606cf6586876fd00913e0506f67aebce':
Import translations. DO NOT MERGE
OSDN Git Service
