OSDN Git Service
Deepanshu Gupta [Wed, 29 Oct 2014 00:07:40 +0000 (00:07 +0000)]
Merge "Use right theme for drawable inflation." into lmp-dev
Joe Fernandez [Tue, 28 Oct 2014 18:15:33 +0000 (18:15 +0000)]
am
40bf63e0: Merge "docs: Update timing of Android Wear app review" into lmp-docs
* commit '
40bf63e0f04b336325c370fbe4c6a8563ba5e2b7':
docs: Update timing of Android Wear app review
David Friedman [Tue, 28 Oct 2014 18:15:28 +0000 (18:15 +0000)]
am
3c00bc01: Merge "Updates Notifications screenshot for Android 5.0." into lmp-docs
* commit '
3c00bc01f9c6e82a0859201f74237998b24872da':
Updates Notifications screenshot for Android 5.0.
Eric Gilmore [Tue, 28 Oct 2014 18:15:24 +0000 (18:15 +0000)]
am
d126294a: Docs: Adding Android Studio instructions for adding IAB service.
* commit '
d126294a8f954fb758d3f67bc5271014748ba9e7':
Docs: Adding Android Studio instructions for adding IAB service.
Quddus Chong [Tue, 28 Oct 2014 18:15:20 +0000 (18:15 +0000)]
am
2b4b3d28: cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
* commit '
2b4b3d289bb26607c8db198dae4bcfbf6247b0c1':
cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
Ricardo Cervera [Tue, 28 Oct 2014 18:15:17 +0000 (18:15 +0000)]
am
61fcad92: docs: Add SearchXonY to Common Intents
* commit '
61fcad92ab55e3f874eb8fddde39dbe64235c2e5':
docs: Add SearchXonY to Common Intents
Deepanshu Gupta [Tue, 28 Oct 2014 17:50:00 +0000 (10:50 -0700)]
Use right theme for drawable inflation.
The theme information was lost when inflating drawables. As a result,
drawables inflated in the ActionBar did not have the right tint.
Change-Id: I13d5c78039e35085ed4902289fcb735bb15d972e
Joe Fernandez [Tue, 28 Oct 2014 03:25:39 +0000 (03:25 +0000)]
Merge "docs: Update timing of Android Wear app review" into lmp-docs
Joe Fernandez [Tue, 28 Oct 2014 00:39:53 +0000 (17:39 -0700)]
docs: Update timing of Android Wear app review
Change-Id: If3d31a9828b5934a871964139b8abc6b12fe8586
David Friedman [Tue, 28 Oct 2014 02:51:30 +0000 (02:51 +0000)]
Merge "Updates Notifications screenshot for Android 5.0." into lmp-docs
David Friedman [Tue, 28 Oct 2014 00:16:44 +0000 (17:16 -0700)]
Updates Notifications screenshot for Android 5.0.
Change-Id: Ib5a3f88ef5d9e580550a18d83568913d6b5d3cef
Jason Monk [Mon, 27 Oct 2014 23:20:02 +0000 (19:20 -0400)]
Add missing passive discovery flag
MediaProjectionManagerService had an active media callback which
was causing a service to be bound 100% of the time. Adding a
passive flag makes it only observe events, and allow the service
to only be bound when needed by apps requesting active discovery.
Bug:
18042409
Bug:
17969854
Change-Id: I1bfa6609e2aa507ee2ce227de50f0e5ae951e000
Eric Gilmore [Fri, 10 Oct 2014 21:24:11 +0000 (14:24 -0700)]
Docs: Adding Android Studio instructions for adding IAB service.
Incorporating some editorial feedback both in and outside the
scope of my small bug fix.
Bug:
17151052
Change-Id: Id3b0c256ca6f7f018fa525eeb1f78979e8f476df
Quddus Chong [Mon, 27 Oct 2014 01:10:42 +0000 (18:10 -0700)]
cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
Change-Id: Ic7402251219a84be92d4e58863fd069de6aa4446
Ying Wang [Mon, 20 Oct 2014 20:44:30 +0000 (13:44 -0700)]
Update current.txt with generics to field types.
Bug:
17014855
Change-Id: I14672092f79374f6c5b2362bd3c2aaac84e0c2ae
Ricardo Cervera [Fri, 10 Oct 2014 20:37:16 +0000 (13:37 -0700)]
docs: Add SearchXonY to Common Intents
Change-Id: Idb68c0dc95dfd0a21a73df707a7a1f5b21c3ee5e
Joe Fernandez [Sat, 25 Oct 2014 08:46:20 +0000 (01:46 -0700)]
docs: Home page - fix card images that are showing up on the home page
Change-Id: I943b9b819f91069f961c5f93b14f01499f587e19
Luan Nguyen [Fri, 24 Oct 2014 23:17:23 +0000 (23:17 +0000)]
Merge "docs: Fix metadata description. Add new gesture test. Split layout test." into lmp-dev
Luan Nguyen [Fri, 24 Oct 2014 22:37:25 +0000 (22:37 +0000)]
am
aec7c974: am
049db36a: Merge "docs: fixed typo/grammar issues." into klp-modular-docs
* commit '
aec7c974eb223b5608bbd2bb06e11fc397e6ffb2':
docs: fixed typo/grammar issues.
Joe Fernandez [Fri, 24 Oct 2014 22:37:16 +0000 (22:37 +0000)]
am
90f734eb: am
0e893eb7: Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs
* commit '
90f734eb180619eb8ffd2e30580f72b500184f8b':
docs:Added 64-bit image note from Preview page
Natalie Masse [Fri, 24 Oct 2014 22:36:54 +0000 (22:36 +0000)]
am
bcf9ced4: am
1e5bb861: Link and typo fixed
* commit '
bcf9ced47a123220271fcca70f71c2adf69ad100':
Link and typo fixed
Luan Nguyen [Fri, 24 Oct 2014 16:02:16 +0000 (09:02 -0700)]
docs: Fix metadata description. Add new gesture test. Split layout test.
Change-Id: I5a8948594af94fa1e7548fc49a0c3946f03d7fc8
Paul Lawrence [Fri, 24 Oct 2014 17:37:40 +0000 (10:37 -0700)]
Stop crypto UI from crashing during encryption
Don't try to read crypto meta data during this time
Bug:
18037893
Change-Id: I3628572b3b90e6fc0a7c71089b447fb0e5303ee9
Luan Nguyen [Fri, 24 Oct 2014 15:59:44 +0000 (15:59 +0000)]
am
049db36a: Merge "docs: fixed typo/grammar issues." into klp-modular-docs
* commit '
049db36afd63b972f971f8bac6a405bc2f9437f4':
docs: fixed typo/grammar issues.
Luan Nguyen [Fri, 24 Oct 2014 15:55:47 +0000 (15:55 +0000)]
Merge "docs: fixed typo/grammar issues." into klp-modular-docs
Joe Fernandez [Fri, 24 Oct 2014 09:27:02 +0000 (09:27 +0000)]
am
0e893eb7: Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs
* commit '
0e893eb7ac1985a02d61525a5e6076d45a1e8c7d':
docs:Added 64-bit image note from Preview page
Natalie Masse [Fri, 24 Oct 2014 08:13:36 +0000 (08:13 +0000)]
am
1e5bb861: Link and typo fixed
* commit '
1e5bb861265072b9af555d09202e49cb38a3c4f1':
Link and typo fixed
Joe Fernandez [Fri, 24 Oct 2014 06:06:00 +0000 (06:06 +0000)]
Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs
Joe Fernandez [Fri, 24 Oct 2014 06:01:57 +0000 (06:01 +0000)]
Merge "docs: Fix typo in search class" into lmp-dev
Joe Fernandez [Fri, 24 Oct 2014 06:00:55 +0000 (06:00 +0000)]
Merge "docs: Fixed 404 link in SDK Tools page." into lmp-dev
Joe Fernandez [Fri, 24 Oct 2014 06:00:18 +0000 (06:00 +0000)]
Merge "docs: Fix hprof-conv location in docs." into lmp-dev
Joe Fernandez [Fri, 24 Oct 2014 05:59:03 +0000 (05:59 +0000)]
Merge "docs: Fixing misc minor bugs." into lmp-dev
Luan Nguyen [Thu, 23 Oct 2014 22:45:02 +0000 (22:45 +0000)]
Merge "docs: Update thumbnail images for resources, update minor text for WR-GS, and update the title image resolution." into lmp-dev
Luan Nguyen [Thu, 23 Oct 2014 17:55:18 +0000 (10:55 -0700)]
docs: Update thumbnail images for resources, update minor text for WR-GS, and
update the title image resolution.
Change-Id: I83e89e3969bd6b837074e86a810cf801be3a6caf
Trevor Johns [Thu, 23 Oct 2014 16:51:37 +0000 (16:51 +0000)]
Merge "Docs: Add TOC page for Wearable samples" into lmp-dev
Trevor Johns [Thu, 23 Oct 2014 16:11:20 +0000 (09:11 -0700)]
Docs: Add TOC page for Wearable samples
Change-Id: I0fdf412f20fb2a45c34c9700ed1ca9446cfc6ff3
Ricardo Cervera [Thu, 23 Oct 2014 15:10:07 +0000 (15:10 +0000)]
Merge "docs: Updating dependency vers nums for support libs." into lmp-dev
Ricardo Cervera [Thu, 23 Oct 2014 15:09:40 +0000 (15:09 +0000)]
Merge "docs: Support lib dependency fix. Bug:
18029377" into lmp-dev
Joe Fernandez [Thu, 23 Oct 2014 07:03:15 +0000 (07:03 +0000)]
Merge "docs: Add Wear App Quality checklist" into lmp-dev
Luan Nguyen [Tue, 21 Oct 2014 23:24:22 +0000 (16:24 -0700)]
docs: Add Wear App Quality checklist
Change-Id: I81ef6b3283ffb4d924836a84b52bb04acb301649
Trevor Johns [Thu, 23 Oct 2014 06:15:32 +0000 (06:15 +0000)]
Merge "Docs: Update /samples/new/index.html for Clockwork Beryl release" into lmp-dev
Joe Fernandez [Thu, 23 Oct 2014 04:39:23 +0000 (04:39 +0000)]
Merge "docs: Add article describing Location API for Android Wear." into lmp-dev
Luan Nguyen [Mon, 13 Oct 2014 18:59:33 +0000 (11:59 -0700)]
docs: Add article describing Location API for Android Wear.
Change-Id: I1956be7df8cc875270d45652d1b0d414b6395982
Trevor Johns [Thu, 23 Oct 2014 03:53:31 +0000 (20:53 -0700)]
Docs: Update /samples/new/index.html for Clockwork Beryl release
Added SpeedTracker sample to list of new samples.
Change-Id: I88094149ab21b9a24f19bb7693bbce1187b625eb
Joe Fernandez [Thu, 23 Oct 2014 03:14:33 +0000 (03:14 +0000)]
Merge "docs:Build tools revisions 21.01 and 21.02" into lmp-dev
Eric Rowe [Thu, 23 Oct 2014 01:41:17 +0000 (01:41 +0000)]
Merge "Add delay in ping connectivity test retry" into lmp-dev
Eric Rowe [Thu, 23 Oct 2014 01:34:43 +0000 (18:34 -0700)]
Add delay in ping connectivity test retry
Change-Id: Id6e36f42b2a2d84605185780fb7a3f2144e7a9b9
smain@google.com [Thu, 23 Oct 2014 00:58:50 +0000 (17:58 -0700)]
update android workplace screenshot
bug:
18038081
Change-Id: I6cc59cf002000ee2c938e634ef3662fbba2c70cc
Rich Slogar [Wed, 22 Oct 2014 21:10:16 +0000 (14:10 -0700)]
docs:Build tools revisions 21.01 and 21.02
Change-Id: I220f35541e88bf3b5dba1981d7375ecece525e2b
Ye Wen [Thu, 23 Oct 2014 00:23:27 +0000 (00:23 +0000)]
Merge "Disable Content-Disposition header for 53005 and 310120" into lmp-dev
smain@google.com [Thu, 23 Oct 2014 00:13:51 +0000 (17:13 -0700)]
fix a few of the tags for helpouts compatibility
Change-Id: Ic7f6f281c937bcba8690a50ce1c5417689993352
smain@google.com [Thu, 23 Oct 2014 00:06:09 +0000 (00:06 +0000)]
Merge "some fixes to TV App quality and TV games doc. add section to TV Games doc about controller instructions w/ template download. clarify use of <meta-data> tag and standardize headings per Training conventions." into lmp-dev
smain@google.com [Wed, 22 Oct 2014 23:59:14 +0000 (23:59 +0000)]
Merge "add helpouts widget to first round of pages" into lmp-dev
Ye Wen [Wed, 22 Oct 2014 23:19:05 +0000 (16:19 -0700)]
Disable Content-Disposition header for 53005 and 310120
Platform PDU lib uses a flag in frameworks/base/core resources
instead of mms config in mms service
b/
17634414
Change-Id: I0ba78d6b7d6f2844eafa3dac3691828414975f43
Rich Slogar [Wed, 22 Oct 2014 22:11:55 +0000 (15:11 -0700)]
docs:Update 4.4W for Wear GPS suppport
Change-Id: I1fc5699c84d2c29b26730a949858f9cd6eba4bbe
xin He [Wed, 22 Oct 2014 17:19:24 +0000 (17:19 +0000)]
Merge "Show ProgressDialog when waiting for radio to turn on when provisioning." into lmp-dev
Ricardo Cervera [Wed, 22 Oct 2014 17:03:43 +0000 (17:03 +0000)]
Merge "docs: Removing extra semicolons in Wear notif examples." into lmp-dev
smain@google.com [Mon, 20 Oct 2014 21:29:22 +0000 (14:29 -0700)]
add helpouts widget to first round of pages
Change-Id: I2afafb2bf682c5d514eb1adde27bf0277e709198
Quddus Chong [Wed, 22 Oct 2014 01:22:38 +0000 (18:22 -0700)]
docs: Updated Android 5.0 API overview to reflect changed WebView behavior for mixed content and 3rd party cookies.
Change-Id: Ib152d6577d2369b71aa52e6013a2ff1fbcab0c6e
Deepanshu Gupta [Wed, 22 Oct 2014 00:57:30 +0000 (00:57 +0000)]
Merge "Check Bridge init before disposing." into lmp-dev
Jinsuk Kim [Tue, 21 Oct 2014 23:25:57 +0000 (23:25 +0000)]
Merge "CEC: Add missing protections for some HdmiControlService API - DO NOT MERGE" into lmp-dev
Santos Cordon [Tue, 21 Oct 2014 23:22:00 +0000 (23:22 +0000)]
Merge "Add hidden method to access a connection's service." into lmp-dev
Paul Jensen [Wed, 15 Oct 2014 01:06:14 +0000 (21:06 -0400)]
Show ProgressDialog when waiting for radio to turn on when provisioning.
Turning on the cellular radio when user selects the provisioning notification
can take 30-60s so a UI is needed to keep the user informed that the radio is
coming up. This is only for provisioning APN support (only AT&T tablets now).
bug:
15990642
Change-Id: Ibea894ee934bae2045c0462ae79bfa39d0ef3f05
Jinsuk Kim [Mon, 20 Oct 2014 22:14:46 +0000 (07:14 +0900)]
CEC: Add missing protections for some HdmiControlService API - DO NOT MERGE
A few methods are found to be missing protection with system permission.
Add enforceAccessPermission() like other methods.
Bug:
17408780
Change-Id: I58a336b5cc9df2d195bdfe7b928898dde5ff169f
(cherry picked from commit
b22d9ee0a364b10d488dd6a2e8ba69d5ca7f6258)
Guang Zhu [Tue, 21 Oct 2014 21:33:50 +0000 (14:33 -0700)]
Block monkey from creating user profiles
Bug:
17721767
Change-Id: Ibf686d6aa5da29411ee23f8ce6826ed93c1fa970
Ricardo Cervera [Tue, 21 Oct 2014 20:15:39 +0000 (13:15 -0700)]
docs: Removing extra semicolons in Wear notif examples.
Bug:
17053734
Change-Id: If11b711e2797eeb2fc392e0658d644c585e4bc54
smain@google.com [Tue, 21 Oct 2014 03:05:08 +0000 (20:05 -0700)]
some fixes to TV App quality and TV games doc.
add section to TV Games doc about controller instructions w/ template download.
clarify use of <meta-data> tag and standardize headings per Training conventions.
Change-Id: I6f61a0d4fd976098a6db9ded33c61419a764ad4f
Ricardo Cervera [Tue, 21 Oct 2014 17:18:19 +0000 (10:18 -0700)]
docs: Fixed 404 link in SDK Tools page.
Bug:
17950558
Change-Id: Ibd110b6aa693b4f5f4c8ca46efdb2c32a88f3dd2
Ricardo Cervera [Tue, 21 Oct 2014 17:12:08 +0000 (10:12 -0700)]
docs: Fix hprof-conv location in docs.
https://code.google.com/p/android/issues/detail?id=76691
Change-Id: I8550731c1defe867d26d5ab4568c4935c89e37d6
Ricardo Cervera [Tue, 21 Oct 2014 16:19:20 +0000 (09:19 -0700)]
docs: Fix typo in search class
Change-Id: Ia1be1f1f3cae60ed9742c8b6d12f6689a48d023f
Ricardo Cervera [Tue, 21 Oct 2014 15:32:02 +0000 (08:32 -0700)]
docs: Fixing misc minor bugs.
Bug:
13872976
Change-Id: I4ea9893b81d8157bf8699820f25c086fd0c4911c
Adrian Roos [Tue, 21 Oct 2014 15:07:39 +0000 (17:07 +0200)]
Delay discovery of system trust agents
Waits for BOOT_COMPLETED when enabling system trust agents.
This fixes an issue where no agents were discovered because the
packages were not ready after an OTA.
Bug:
18065140
Change-Id: Ibff9948e1536e07f868d6b29f432923a137091e6
Leon Scroggins III [Tue, 21 Oct 2014 13:52:29 +0000 (13:52 +0000)]
Merge "Report that a JavaInputStreamAdaptor is at end." into lmp-dev
Robin Lee [Tue, 21 Oct 2014 11:54:50 +0000 (11:54 +0000)]
Merge "DevicePolicy: Restore CA warning to K behaviour" into lmp-dev
Leon Scroggins III [Thu, 16 Oct 2014 20:50:41 +0000 (16:50 -0400)]
Report that a JavaInputStreamAdaptor is at end.
This prevents a naive caller from continuing to attempt to read.
BUG:
17419670
BUG:
17873145
Change-Id: Idd462ff9055aea42e8c7d5d58ef177f9e667385b
RoboErik [Mon, 20 Oct 2014 22:08:06 +0000 (22:08 +0000)]
Merge "Add missing break to switch statement" into lmp-dev
Ricardo Cervera [Fri, 17 Oct 2014 17:50:14 +0000 (10:50 -0700)]
docs: Updating dependency vers nums for support libs.
Change-Id: I1b9ce98b8ccccc42790af913a49c27e73610fd50
RoboErik [Mon, 20 Oct 2014 21:56:32 +0000 (14:56 -0700)]
Add missing break to switch statement
the skip to queue item case was falling through when it shouldn't.
bug:
18058515
Change-Id: Ica20b59efad12a58ad16501146fc9a0d4595e184
smain@google.com [Mon, 20 Oct 2014 21:33:00 +0000 (14:33 -0700)]
Doc change: misc changes to highlights.
Change-Id: I60964bf1d8e299985da9ca6b2b6cfb70a1477bbc
Adam Lesinski [Mon, 20 Oct 2014 20:55:48 +0000 (20:55 +0000)]
Merge "AAPT: Fix path for final generated resources on Windows" into lmp-dev
Robin Lee [Mon, 20 Oct 2014 20:46:53 +0000 (21:46 +0100)]
DevicePolicy: Restore CA warning to K behaviour
Some tests rely on this being dismissible. Additionally it turns out
some users don't like having a hulking great notification follow them
around everywhere.
Bug:
17985258
Change-Id: If05a07b9eaa402a48f9a14647effc1df32c796e1
ztenghui [Mon, 20 Oct 2014 20:29:15 +0000 (20:29 +0000)]
Merge "Make sure the bitmap from VD's cache is drawn using bi-linear filter." into lmp-dev
Adam Lesinski [Mon, 20 Oct 2014 19:15:25 +0000 (12:15 -0700)]
AAPT: Fix path for final generated resources on Windows
Change-Id: Id11ac79b281b51747c73f90406ebd60023c54f92
RoboErik [Mon, 20 Oct 2014 19:07:51 +0000 (19:07 +0000)]
Merge "Set the metadata rating correctly in RCC" into lmp-dev
Santos Cordon [Fri, 17 Oct 2014 02:23:54 +0000 (19:23 -0700)]
Add hidden method to access a connection's service.
This change exposes a method that is used by the actual
fix here: I4e4789c044d9e3614f42143cfa6053881a6d109b
Bug:
17962996
Change-Id: Iec3795ea372634120c71b0a80ee046e372569ecf
Deepanshu Gupta [Mon, 20 Oct 2014 18:07:38 +0000 (11:07 -0700)]
Check Bridge init before disposing.
In some cases ADT may dispose the Bridge even before init is called on
it. This caused an NPE. Fixed this by checking for the initialization
before disposing resources.
Bug: http://b.android.com/77726
Change-Id: I741d6ea3595a3b7cb816abd0417f23aecca6370e
Geoff Mendal [Mon, 20 Oct 2014 16:56:45 +0000 (16:56 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
smain@google.com [Mon, 20 Oct 2014 16:41:08 +0000 (09:41 -0700)]
update workplace description in lollipop highlights
bug:
18038081
Change-Id: I612fc52392bc0fb71cc2e7b4c0da1fcaae6ac6fe
RoboErik [Mon, 20 Oct 2014 16:48:13 +0000 (09:48 -0700)]
Set the metadata rating correctly in RCC
We weren't setting the ratings in the new MediaMetadata from RCC.
This adds some code to set them correctly.
bug:
18051829
Change-Id: I358eeb2b25b3fb9bd9a5d207eb3314bb2cdff25e
Geoff Mendal [Mon, 20 Oct 2014 16:34:39 +0000 (09:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3dd702947875349b8ca04edb813687588e4db689
Auto-generated-cl: translation import
Geoff Mendal [Mon, 20 Oct 2014 13:41:24 +0000 (13:41 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Geoff Mendal [Mon, 20 Oct 2014 13:35:29 +0000 (06:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9d2178c81e9acc3ce353f317787cb12f6e158666
Auto-generated-cl: translation import
Adrian Roos [Mon, 20 Oct 2014 12:58:58 +0000 (12:58 +0000)]
Merge "Always execute resumeAppSwitches when launching something" into lmp-dev
Baligh Uddin [Sun, 19 Oct 2014 22:11:41 +0000 (22:11 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Sun, 19 Oct 2014 22:11:32 +0000 (22:11 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Sun, 19 Oct 2014 20:18:18 +0000 (13:18 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie58f06a42538d4d68cd07c8bf92a4a7104d01a1a
Auto-generated-cl: translation import
Baligh Uddin [Sun, 19 Oct 2014 19:55:23 +0000 (12:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: I382cff15f6fd4e02e2781bbb2b51e7eb3897b6fc
Auto-generated-cl: translation import
Baligh Uddin [Sun, 19 Oct 2014 19:46:08 +0000 (19:46 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Sun, 19 Oct 2014 19:46:06 +0000 (19:46 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Sun, 19 Oct 2014 17:56:51 +0000 (10:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: I53740eab00c3d795b9e7514e079bc2a74b557d95
Auto-generated-cl: translation import