OSDN Git Service
repo sync [Mon, 22 Apr 2013 20:37:02 +0000 (13:37 -0700)]
resolved conflicts for merge of
a1939d22 to gb-ub-photos-carlsbad
Change-Id: Ic6759448c932823720021e85e1232736ff2085f8
ztenghui [Fri, 19 Apr 2013 17:51:09 +0000 (17:51 +0000)]
Merge "Update the duration information when saving new video" into gb-ub-photos-carlsbad
John Hoford [Fri, 19 Apr 2013 01:41:44 +0000 (01:41 +0000)]
Merge "fixed borders issues" into gb-ub-photos-bryce
ztenghui [Thu, 18 Apr 2013 23:18:26 +0000 (16:18 -0700)]
Update the duration information when saving new video
Change-Id: I9c3fd33dba7f04d9d905429c6bb17cf9a10b7628
Flavio Lerda [Thu, 18 Apr 2013 23:00:15 +0000 (16:00 -0700)]
am
ed2f1790: Merge "Remove unused imports." into gb-ub-photos-bryce
* commit '
ed2f17903bbbca08ac98af4aa6c1dd9d22504a1d':
Remove unused imports.
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:05 +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:22:49 +0000 (14:22 -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
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:28 +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
nicolasroard [Thu, 18 Apr 2013 16:20:56 +0000 (09:20 -0700)]
Add extra perf logging
Change-Id: Iebbb4491e69d356c0c73cd314c295857a2d6e357
Baligh Uddin [Thu, 18 Apr 2013 14:41:13 +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:12 +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:39:53 +0000 (14:39 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
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:21:55 +0000 (06:21 -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
John Hoford [Thu, 18 Apr 2013 03:18:38 +0000 (03:18 +0000)]
Merge "Support for save state in images" into gb-ub-photos-carlsbad
Ruben Brunk [Thu, 18 Apr 2013 02:52:38 +0000 (19:52 -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:59:32 +0000 (18:59 -0700)]
Revert "Remove redeye filter."
Bug:
8609003
Change-Id: Iac397cf2db7fd991b278f70de63fa18f1b620312
Ruben Brunk [Thu, 18 Apr 2013 01:52:15 +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:11 +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
ztenghui [Wed, 17 Apr 2013 21:52:13 +0000 (21:52 +0000)]
Merge "When video not seekable, don't show the scrubber" into gb-ub-photos-carlsbad
ztenghui [Wed, 17 Apr 2013 21:41:05 +0000 (14:41 -0700)]
When video not seekable, don't show the scrubber
bug:
7117365
Change-Id: I133ea68eaebf1d875a27336ac524d785efe71cc2
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: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:25:37 +0000 (11:25 -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
John Hoford [Tue, 16 Apr 2013 05:10:43 +0000 (22:10 -0700)]
Support for save state in images
bug:
8626775
Change-Id: I2a34a6027b23dab9c1802f672bfbf399cac0c4f7
nicolasroard [Wed, 17 Apr 2013 15:37:22 +0000 (08:37 -0700)]
Fix border apply if no filter applied
Change-Id: Ic5b319625b42adb298094c4ad202d6c161538644
Flavio Lerda [Tue, 16 Apr 2013 08:46:07 +0000 (09:46 +0100)]
Usage statistics for sharing.
Bug:
8433834
Change-Id: Iaec6150443258daa213395b6fb1e8d8d3e6123b3
Ruben Brunk [Wed, 17 Apr 2013 01:17:19 +0000 (01:17 +0000)]
Merge "Revert "Shows final set of filters in UI."" into gb-ub-photos-carlsbad
nicolasroard [Wed, 17 Apr 2013 00:45:52 +0000 (17:45 -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:16:07 +0000 (17:16 -0700)]
Revert "Shows final set of filters in UI."
Bug:
8609003
Change-Id: I24c343f62aa5e5c9a903cdd746abf2dc2b992418
Ruben Brunk [Wed, 17 Apr 2013 00:03:29 +0000 (17:03 -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.
nicolasroard [Wed, 17 Apr 2013 00:00:40 +0000 (17:00 -0700)]
Re-enable Simple Editor menu item
Change-Id: I080dfffeb6394b78a1dc2bd10b52ff15b1e55ac9
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:16 +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:16 +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
ztenghui [Tue, 16 Apr 2013 22:47:01 +0000 (22:47 +0000)]
Merge "Add accessibility to video player controller." into gb-ub-photos-carlsbad
nicolasroard [Tue, 16 Apr 2013 22:44:57 +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
ztenghui [Tue, 16 Apr 2013 20:52:07 +0000 (13:52 -0700)]
Add accessibility to video player controller.
bug:
5714277
Change-Id: If0de1ec250a211890e1914d89e8b61780542a675
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:41 +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:24:02 +0000 (13:24 -0700)]
am
fb6a8e16: New state panel
* commit '
fb6a8e166f0a46d2a994a408b1679e3a67fdcb52':
New state panel
Christian Wichner [Tue, 16 Apr 2013 17:07:50 +0000 (19:07 +0200)]
convertBitmap is needed by ImageFilterFixedFrame.
Change-Id: I2094c54745f94dab2283e2a466371d15d5a57b0a
nicolasroard [Mon, 15 Apr 2013 21:41:00 +0000 (14:41 -0700)]
New state panel
bug:
8620913
bug:
8503386
Change-Id: I35c95103e3b5097df93fa3f48e5562a479915f06
Ruben Brunk [Tue, 16 Apr 2013 01:22:09 +0000 (18:22 -0700)]
Add local database for filters.
Bug:
8621039
Change-Id: I7b13ff0167483f148b354204cb01262fe40da2ba
Michael Kolb [Tue, 16 Apr 2013 00:29:55 +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:30 +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 20:29:53 +0000 (13:29 -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:37 +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
Baligh Uddin [Mon, 15 Apr 2013 19:57:35 +0000 (19:57 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Michael Kolb [Mon, 15 Apr 2013 19:43:30 +0000 (12:43 -0700)]
am
ad30f960: Merge "Add menu labels" into gb-ub-photos-bryce
* commit '
ad30f960879285c4dadb10d5b7531e05c345587f':
Add menu labels
Michael Kolb [Mon, 15 Apr 2013 19:40:32 +0000 (19:40 +0000)]
Merge "Add menu labels" into gb-ub-photos-bryce
Bobby Georgescu [Mon, 15 Apr 2013 19:33:22 +0000 (12:33 -0700)]
am
3dc6a630: Merge "Fix performance and other issues related to multi-selection" into gb-ub-photos-bryce
* commit '
3dc6a630aff5be323c54b4616fd3a373cbad31f7':
Fix performance and other issues related to multi-selection
Bobby Georgescu [Mon, 15 Apr 2013 19:30:02 +0000 (19:30 +0000)]
Merge "Fix performance and other issues related to multi-selection" into gb-ub-photos-bryce
John Hoford [Mon, 15 Apr 2013 18:48:03 +0000 (11:48 -0700)]
am
d2f5fe60: support for simplified parameters in filter
* commit '
d2f5fe607ee6d7b5f79862b495495e2f6024cdab':
support for simplified parameters in filter
Michael Kolb [Wed, 10 Apr 2013 15:50:51 +0000 (08:50 -0700)]
Add menu labels
Bug:
8618169
Change-Id: Iea1ac7256450afd2870c144099459f32868c699f
John Hoford [Wed, 10 Apr 2013 21:58:05 +0000 (14:58 -0700)]
support for simplified parameters in filter
Change-Id: I623e6fb90e8175c7e5e2dfc146f927eecba29817
Baligh Uddin [Mon, 15 Apr 2013 18:36:00 +0000 (11:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib788a26efef90860ae6bf9a3ef3bd283bca99c5d
Auto-generated-cl: translation import
nicolasroard [Sat, 13 Apr 2013 15:12:38 +0000 (08:12 -0700)]
am
4b6ea5bc: Add direct rendering for border
* commit '
4b6ea5bce9b68eea16eb8a0980501f671e7fbf44':
Add direct rendering for border
nicolasroard [Sat, 13 Apr 2013 00:47:14 +0000 (17:47 -0700)]
Add direct rendering for border
bug:
8603245
Change-Id: Ibc1bde9adb19f930b474e4076a0c2720fbe0bc8d
Bobby Georgescu [Fri, 12 Apr 2013 22:11:39 +0000 (15:11 -0700)]
Fix performance and other issues related to multi-selection
Bug:
8606565
Bug:
8607510
Change-Id: I5bd01745b6d1047571d562e1637a2999afddfec2
Baligh Uddin [Fri, 12 Apr 2013 23:38:04 +0000 (16:38 -0700)]
am
b9db2d6a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
b9db2d6aeb5b3b1d6a2335509de14612ce4453c3':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 12 Apr 2013 23:34:05 +0000 (23:34 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Angus Kong [Fri, 12 Apr 2013 22:30:33 +0000 (15:30 -0700)]
Load video items in the new camera filmstrip.
Also fixes:
1. NPE when no data to load.
2. The last item is skipped.
3. date and id should be long instead of int.
Change-Id: I7cad06998d78e0d3f0a30be24e65eb0f777b9c0e
Bart Sears [Fri, 12 Apr 2013 21:28:19 +0000 (14:28 -0700)]
am
4772792d: Bump up the version number to 1.1.40010
* commit '
4772792dbe4a29bd90139eead6a881f47523ede5':
Bump up the version number to 1.1.40010
Bart Sears [Fri, 12 Apr 2013 20:48:58 +0000 (13:48 -0700)]
Bump up the version number to 1.1.40010
Bug:
8607157
Change-Id: I4c0f4cd481d0989cad2fd9cadbda9f7768b81765
nicolasroard [Fri, 12 Apr 2013 20:19:06 +0000 (13:19 -0700)]
am
93ef658b: Add a direct rendering mode
* commit '
93ef658bf44d7ecd79894a9a225a400c2741058f':
Add a direct rendering mode
nicolasroard [Thu, 11 Apr 2013 02:27:57 +0000 (19:27 -0700)]
Add a direct rendering mode
This takes input and output allocations.
Also added a utility method in ImageFilterRS
to scale textures at screen resolution.
bug:
8603245
bug:
8588853
Change-Id: Ic5e4dea2289f0edd7518fc07f04b523be5316e82
Baligh Uddin [Fri, 12 Apr 2013 18:20:18 +0000 (11:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib9a794dd416ad278849b4a0900307f0fbdd8f927
Auto-generated-cl: translation import
Michael Kolb [Fri, 12 Apr 2013 17:04:29 +0000 (10:04 -0700)]
am
bacc5027: Merge "Add checks for NPE in video pie menu." into gb-ub-photos-bryce
* commit '
bacc5027e5ecfb92d6d0ba8824e878f6bea9a80e':
Add checks for NPE in video pie menu.
OSDN Git Service
