OSDN Git Service
Doris Liu [Sat, 27 Oct 2012 00:32:35 +0000 (17:32 -0700)]
am
591974bc: Merge "Show panoViewer icon after "Back" from viewer" into gb-ub-photos-arches
* commit '
591974bceb89bccf3376a7c424017e847eca61df':
Show panoViewer icon after "Back" from viewer
Doris Liu [Sat, 27 Oct 2012 00:30:01 +0000 (17:30 -0700)]
Merge "Show panoViewer icon after "Back" from viewer" into gb-ub-photos-arches
Doris Liu [Sat, 27 Oct 2012 00:17:17 +0000 (17:17 -0700)]
Show panoViewer icon after "Back" from viewer
Bug:
7407942
Change-Id: I00da3c73a558e412e106f089034e83f2e75616e4
George Mount [Fri, 26 Oct 2012 23:46:14 +0000 (16:46 -0700)]
am
b6d49492: Remove black borders in Manta LightCycle capture after orientation change.
* commit '
b6d494925ea14a02ef75f58d5d969d7586914ef7':
Remove black borders in Manta LightCycle capture after orientation change.
George Mount [Wed, 24 Oct 2012 22:07:50 +0000 (15:07 -0700)]
Remove black borders in Manta LightCycle capture after orientation change.
Bug
7344906
Change-Id: I70017e4479962d49aedb06ea7b050f638e00fc06
Bobby Georgescu [Fri, 26 Oct 2012 22:19:39 +0000 (15:19 -0700)]
am
88870365: Merge "Fix the black lines near edge of thumbnails" into gb-ub-photos-arches
* commit '
88870365af146d05162742c5f613fc92483b0a93':
Fix the black lines near edge of thumbnails
Bobby Georgescu [Fri, 26 Oct 2012 22:11:25 +0000 (15:11 -0700)]
Merge "Fix the black lines near edge of thumbnails" into gb-ub-photos-arches
John Reck [Fri, 26 Oct 2012 17:04:45 +0000 (10:04 -0700)]
am
10f975a6: Merge "Add proxy launcher" into gb-ub-photos-arches
* commit '
10f975a628badbb400a97872c6704740ef936e46':
Add proxy launcher
John Reck [Fri, 26 Oct 2012 17:03:05 +0000 (10:03 -0700)]
Merge "Add proxy launcher" into gb-ub-photos-arches
Bobby Georgescu [Fri, 26 Oct 2012 12:01:07 +0000 (05:01 -0700)]
am
798f4a91: Merge "Hold WakeLock for batch delete operation" into gb-ub-photos-arches
* commit '
798f4a914d47e69496374051fab386a3536c9698':
Hold WakeLock for batch delete operation
Bobby Georgescu [Fri, 26 Oct 2012 11:59:23 +0000 (04:59 -0700)]
Merge "Hold WakeLock for batch delete operation" into gb-ub-photos-arches
Owen Lin [Fri, 26 Oct 2012 10:55:49 +0000 (18:55 +0800)]
Fix the black lines near edge of thumbnails
1. Correct the positions of right and bottom borders
2. Turn off blending by using PoterDuffMode.SRC
bug:
7414307
Change-Id: Icc6fd765c2b1e904308c53aa66b55600e0016471
nicolasroard [Fri, 26 Oct 2012 07:52:54 +0000 (00:52 -0700)]
am
8d8cdf7f: Fix colors in rotate and mirror
* commit '
8d8cdf7f67db69309fd740ca301fbeaadac8a9f0':
Fix colors in rotate and mirror
nicolasroard [Fri, 26 Oct 2012 07:02:18 +0000 (00:02 -0700)]
Fix colors in rotate and mirror
bug:
7419025
Change-Id: Icf92de032f62f93a3ac57e042ea582c760d9f600
nicolasroard [Fri, 26 Oct 2012 06:42:14 +0000 (23:42 -0700)]
am
8b3ce9b0: Merge "Fix crash when showing history" into gb-ub-photos-arches
* commit '
8b3ce9b01275151b653ea138324e47eb66a7b47e':
Fix crash when showing history
nicolasroard [Fri, 26 Oct 2012 06:41:00 +0000 (23:41 -0700)]
Merge "Fix crash when showing history" into gb-ub-photos-arches
nicolasroard [Fri, 26 Oct 2012 06:27:32 +0000 (23:27 -0700)]
Fix crash when showing history
bug:
7418823
Change-Id: I0a84bb4d8fc8b42fc953f8301bb2b24cf64edce7
Hung-ying Tyan [Fri, 26 Oct 2012 04:18:46 +0000 (21:18 -0700)]
am
635aab56: Merge "Fix tiling effect when open a photo." into gb-ub-photos-arches
* commit '
635aab5631e25488610ff5546c51ea2895dda2f0':
Fix tiling effect when open a photo.
Hung-ying Tyan [Fri, 26 Oct 2012 04:17:12 +0000 (21:17 -0700)]
Merge "Fix tiling effect when open a photo." into gb-ub-photos-arches
Nicolas Roard [Fri, 26 Oct 2012 02:23:20 +0000 (19:23 -0700)]
am
24f28850: Merge "Do not add crop into preset if in inital setup" into gb-ub-photos-arches
* commit '
24f28850adcb14a1de87e538f60f3bb309bed284':
Do not add crop into preset if in inital setup
Nicolas Roard [Fri, 26 Oct 2012 02:21:45 +0000 (19:21 -0700)]
Merge "Do not add crop into preset if in inital setup" into gb-ub-photos-arches
Bobby Georgescu [Thu, 25 Oct 2012 21:55:55 +0000 (14:55 -0700)]
Hold WakeLock for batch delete operation
Bug:
6680729
Change-Id: I0bdd59edb60c746c8c9e3c3608be980247f0d91a
John Hoford [Fri, 26 Oct 2012 01:38:51 +0000 (18:38 -0700)]
Do not add crop into preset if in inital setup
bug:
7417545
Change-Id: I355936645e555e3d6b950923af301b437570dd93
John Reck [Wed, 24 Oct 2012 18:11:51 +0000 (11:11 -0700)]
Add proxy launcher
Bug:
7394901
Change-Id: I667a6e6fbd11d4c02dc536067bb6f3813775db9c
John Reck [Fri, 26 Oct 2012 00:50:45 +0000 (17:50 -0700)]
am
6106c833: Merge "Add loading spinner" into gb-ub-photos-arches
* commit '
6106c833161cf8e64fc6a9580116f11f4a02d98b':
Add loading spinner
John Reck [Fri, 26 Oct 2012 00:49:27 +0000 (17:49 -0700)]
Merge "Add loading spinner" into gb-ub-photos-arches
Mangesh Ghiware [Fri, 26 Oct 2012 00:47:30 +0000 (17:47 -0700)]
am
5388677d: Merge "Handle 360 panorama specific MIME type." into gb-ub-photos-arches
* commit '
5388677d3078f2c218d22465c955e3df6b2ffbed':
Handle 360 panorama specific MIME type.
Mangesh Ghiware [Fri, 26 Oct 2012 00:44:54 +0000 (17:44 -0700)]
Merge "Handle 360 panorama specific MIME type." into gb-ub-photos-arches
John Reck [Thu, 25 Oct 2012 17:08:37 +0000 (10:08 -0700)]
Add loading spinner
Bug:
7408575
Change-Id: Ia737b36abb88d75381f41c25474e3cc03448dbb9
Mangesh Ghiware [Wed, 10 Oct 2012 22:56:29 +0000 (15:56 -0700)]
Handle 360 panorama specific MIME type.
Bug:
7407448
Change-Id: I939a061e2100c2cdc17279982de98f1d446d8aef
Ruben Brunk [Fri, 26 Oct 2012 00:00:58 +0000 (17:00 -0700)]
am
4164fabf: Merge "Fix issue where aspect bounds don\'t get applied." into gb-ub-photos-arches
* commit '
4164fabf5f9324adde9954130aad13c2f72aa24a':
Fix issue where aspect bounds don't get applied.
Ruben Brunk [Fri, 26 Oct 2012 00:00:57 +0000 (17:00 -0700)]
am
d72971e6: Merge "Fixed crop intent." into gb-ub-photos-arches
* commit '
d72971e683069d463c78117037414e5286689549':
Fixed crop intent.
Ruben Brunk [Fri, 26 Oct 2012 00:00:20 +0000 (17:00 -0700)]
Merge "Fix issue where aspect bounds don't get applied." into gb-ub-photos-arches
Ruben Brunk [Thu, 25 Oct 2012 23:59:41 +0000 (16:59 -0700)]
Merge "Fixed crop intent." into gb-ub-photos-arches
Ruben Brunk [Thu, 25 Oct 2012 01:24:34 +0000 (18:24 -0700)]
Fix issue where aspect bounds don't get applied.
Bug:
7407937
Change-Id: Ie6484d6458657d6284e04de755a8cc1a912dfb6c
Ruben Brunk [Thu, 25 Oct 2012 22:53:42 +0000 (15:53 -0700)]
Fixed crop intent.
Bug:
7415140
Bug:
7403813
Change-Id: I545162544f845d210d21185cddaca09b219fb091
Ruben Brunk [Thu, 25 Oct 2012 22:11:16 +0000 (15:11 -0700)]
am
15aff7c3: Merge "Tagged strings in XML with translation info." into gb-ub-photos-arches
* commit '
15aff7c3b27e2938cea3734cb350671386d210c7':
Tagged strings in XML with translation info.
Ruben Brunk [Thu, 25 Oct 2012 22:09:23 +0000 (15:09 -0700)]
Merge "Tagged strings in XML with translation info." into gb-ub-photos-arches
Michael Jurka [Thu, 25 Oct 2012 20:17:33 +0000 (13:17 -0700)]
Fix conflict with other build fix
Change-Id: Id5286ee8d335b6307f6602e933364f462f19bff2
Bobby Georgescu [Thu, 25 Oct 2012 20:16:18 +0000 (13:16 -0700)]
am
6cfd3b8d: Merge "Get rid of black lines near edge of thumbnails" into gb-ub-photos-arches
* commit '
6cfd3b8d34cf627b3b41bf53e9ceb70f9d0ed17f':
Get rid of black lines near edge of thumbnails
Bobby Georgescu [Thu, 25 Oct 2012 20:14:50 +0000 (13:14 -0700)]
Merge "Get rid of black lines near edge of thumbnails" into gb-ub-photos-arches
Michael Jurka [Thu, 25 Oct 2012 19:30:55 +0000 (12:30 -0700)]
am
0c7e8aac: Merge "Fix build." into gb-ub-photos-arches
* commit '
0c7e8aac441c18117b8daf3255d2658b83a37bde':
Fix build.
Michael Jurka [Thu, 25 Oct 2012 19:28:28 +0000 (12:28 -0700)]
Merge "Fix build." into gb-ub-photos-arches
Michael Jurka [Thu, 25 Oct 2012 19:25:31 +0000 (12:25 -0700)]
Merge "Fix build" into jb-mr1-dev
Angus Kong [Thu, 25 Oct 2012 19:21:23 +0000 (03:21 +0800)]
Fix build.
Change-Id: Ia7b581eba32f98d695117526d25876e7a8a398c0
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
Ruben Brunk [Thu, 25 Oct 2012 19:03:54 +0000 (12:03 -0700)]
Tagged strings in XML with translation info.
Bug:
7403813
Change-Id: Iff1ec505c2c6fbfc11f7f472cc2e67430cf3715d
nicolasroard [Thu, 25 Oct 2012 18:54:57 +0000 (11:54 -0700)]
Fix crash when starting filtereditor
bug:
7415170
Change-Id: I9d54b1179f343aa089bfd9a065ecddaa8a4283b8
Bobby Georgescu [Thu, 25 Oct 2012 18:54:39 +0000 (11:54 -0700)]
Get rid of black lines near edge of thumbnails
Bug:
7414307
Change-Id: If77e04945ff6df65301a6802dd40fabc8c329bfa
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
Owen Lin [Wed, 24 Oct 2012 12:35:45 +0000 (20:35 +0800)]
Fix tiling effect when open a photo.
1. Don't draw the tiles of full image before screen nail is ready.
2. Upload multiple tiles in each frame in order to show photo quickly.
bug:
7403409
Change-Id: Ic5a88a29fe302068e97ab81ab260d0cc572dd7ff
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