OSDN Git Service
Julia Reynolds [Mon, 13 Jun 2016 16:55:20 +0000 (12:55 -0400)]
DND header should be translated.
Change-Id: Iac764d71e91f5a0dc1b58bfca8a38d823f0598b9
Fixes:
29123731
TreeHugger Robot [Mon, 13 Jun 2016 17:29:21 +0000 (17:29 +0000)]
Merge "Remove 'You can choose to either trust or remove this certificate' from Check certificate dialog" into nyc-dev
Robin Lee [Mon, 13 Jun 2016 16:03:54 +0000 (16:03 +0000)]
Merge "Respect DISALLOW_CONFIG_VPN for disconnect dialog" into nyc-dev
Michal Karpinski [Mon, 13 Jun 2016 15:52:58 +0000 (16:52 +0100)]
Remove 'You can choose to either trust or remove this certificate' from Check certificate dialog
Removing because user might not be able to remove (because the option is disallowed).
Bug:
29102580
Change-Id: I4aaedb2a74742a891e95c65e39d0f702377e6836
Robin Lee [Mon, 13 Jun 2016 13:19:44 +0000 (14:19 +0100)]
Respect DISALLOW_CONFIG_VPN for disconnect dialog
Change-Id: Idfe3899e81eec5efdbd5700bdc65921de6853898
Fix:
29265163
Nicolas Prévot [Mon, 13 Jun 2016 12:37:05 +0000 (12:37 +0000)]
Merge "Fix rendering of policy transparency activity." into nyc-dev
Bill Yi [Fri, 10 Jun 2016 20:49:23 +0000 (13:49 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1e7bce31415e722131d6127fc7534669ce527d37
Auto-generated-cl: translation import
TreeHugger Robot [Fri, 10 Jun 2016 15:06:34 +0000 (15:06 +0000)]
Merge "Fix crash in finish from onCreate." into nyc-dev
Jason Monk [Fri, 10 Jun 2016 13:49:12 +0000 (09:49 -0400)]
Fix crash in finish from onCreate.
Change-Id: Ia4937fecdc93e30a468b8fefd2f8776186c8e151
Fixes:
29245324
Yohei Yukawa [Thu, 9 Jun 2016 23:47:31 +0000 (23:47 +0000)]
Merge "Fix sentence capitalization of locale names." into nyc-dev
Roozbeh Pournader [Thu, 9 Jun 2016 23:04:21 +0000 (23:04 +0000)]
Merge "Use existing localizations for formatting data usage [DO NOT MERGE]" into nyc-dev
Svetoslav Ganov [Thu, 9 Jun 2016 22:45:49 +0000 (22:45 +0000)]
Merge "Don't send user to permissions screen if none requested" into nyc-dev
Yohei Yukawa [Thu, 9 Jun 2016 22:01:52 +0000 (15:01 -0700)]
Fix sentence capitalization of locale names.
It turns out that out previous CL [1] is not sufficient to address all
the requests regarding capitalization.
With [1], now InputMethodSubtype#getLocaleDisplayName() returns a locale
name whose capitalization is basically optimized to be used as a list
item. It works well for list UI, but on a UI element that looks like a
sentence text, we still need to capitalize the first character.
This CL takes care of those UI elements in the Settings app. This CL
also addresses a remaining TODO about locale-unaware text formatting by
using about android.icu.text.ListFormatter.
[1]: If105082ce703db7a86738455db7e9fb37f3c6fe8
e489baf96df2837a3a63b626d9023a4a8b322c28
Bug:
29035638
Change-Id: I59f93f0bc067cdd87c6065c972a7da3cde1128f9
Roozbeh Pournader [Thu, 9 Jun 2016 04:55:09 +0000 (21:55 -0700)]
Use existing localizations for formatting data usage [DO NOT MERGE]
This partially reverts I5be9bb7ce3b11709117da698d6c03610f4e5e40e in
order to use existing localizations and also avoid hard to localize
strings.
Also, we now bidi wrap the usage value, since it may break in the RTL
locales otherwise.
Bug:
28747101
Change-Id: Ibc03632cccfe671164cfbb670a423ada1177db65
Nicolas Prevot [Thu, 9 Jun 2016 10:27:57 +0000 (11:27 +0100)]
Fix rendering of policy transparency activity.
Use the dialog's context instead of the activity
context to inflate the view.
BUG:
29172155
Change-Id: I0fb32e3d4bfc522a4c8b6d7a6ed55acd01f97446
Svet Ganov [Thu, 9 Jun 2016 05:32:07 +0000 (22:32 -0700)]
Don't send user to permissions screen if none requested
bug:
29105157
Change-Id: I90ef18f41deae9a7cf28192bd47f16c3af262c29
Bill Yi [Thu, 9 Jun 2016 05:38:29 +0000 (22:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7b3039eadee367f4839682567022826320d208e0
Auto-generated-cl: translation import
Jason Monk [Wed, 8 Jun 2016 19:13:05 +0000 (19:13 +0000)]
Merge "Remove PreferenceActivity" into nyc-dev
Jason Monk [Wed, 8 Jun 2016 19:11:51 +0000 (19:11 +0000)]
Merge "Fix data usage format strings" into nyc-dev
Jason Monk [Wed, 8 Jun 2016 19:10:08 +0000 (19:10 +0000)]
Merge "Fix disabling of tiles that are not relevant" into nyc-dev
Ricky Wai [Wed, 8 Jun 2016 14:34:02 +0000 (14:34 +0000)]
Merge "Make work challenge settings work even work profile is not enabled yet" into nyc-dev
Jason Monk [Mon, 6 Jun 2016 20:01:58 +0000 (16:01 -0400)]
Remove PreferenceActivity
Its broken and isn't worth maintaining, instead port the few things
using it over to SettingsPreferenceActivity with wrapping blank
Activities like the rest of Settings.
Change-Id: Ic82f0dcb63ed9b4078f7da6a79c0c52f0130e8d1
Fixes:
28779941
Ricky Wai [Tue, 7 Jun 2016 15:54:25 +0000 (16:54 +0100)]
Make work challenge settings work even work profile is not enabled yet
Bug:
29090660
Change-Id: I21996700f1ee451e8420f3f257c6ed51feea4ecb
Baligh Uddin [Wed, 8 Jun 2016 13:09:21 +0000 (13:09 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Wed, 8 Jun 2016 04:21:26 +0000 (21:21 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
29169863
Change-Id: Ibe6c3ae08e13bc4984932908f9a3ae2ca632b26c
TreeHugger Robot [Wed, 8 Jun 2016 00:31:28 +0000 (00:31 +0000)]
Merge "Move legacy full disk encryption code to Settings." into nyc-dev
Jim Miller [Tue, 7 Jun 2016 22:44:46 +0000 (15:44 -0700)]
Move legacy full disk encryption code to Settings.
Fixes bug
27617297
Change-Id: Ib975cf8d4f2e1e7fa8a77550ca4ee8233647e9db
Jason Monk [Tue, 7 Jun 2016 18:02:33 +0000 (14:02 -0400)]
Fix disabling of tiles that are not relevant
- Fix restricted user tiles being disabled
- Call new better method in SettingsDrawerActivity for disabling
Change-Id: I2fb6ddd3d505189d2b6d96c0a1039291b80a2f70
Fixes:
29080209
TreeHugger Robot [Tue, 7 Jun 2016 03:23:12 +0000 (03:23 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Tue, 7 Jun 2016 01:48:05 +0000 (18:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1f567719e29fcdea3acf79df2b310301f948befb
Auto-generated-cl: translation import
Robin Lee [Mon, 6 Jun 2016 20:59:00 +0000 (20:59 +0000)]
Merge "Restrict Settings always-on to NYC+" into nyc-dev
Jason Monk [Mon, 6 Jun 2016 20:39:55 +0000 (16:39 -0400)]
Fix data usage format strings
Bug:
28747101
Change-Id: I5be9bb7ce3b11709117da698d6c03610f4e5e40e
Robin Lee [Mon, 23 May 2016 15:32:47 +0000 (16:32 +0100)]
Restrict Settings always-on to NYC+
Bug:
28413917
Change-Id: I1c40bdc94bb05d21daf589840adbbf04abe6c10f
TreeHugger Robot [Fri, 3 Jun 2016 19:22:55 +0000 (19:22 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Jason Monk [Fri, 3 Jun 2016 19:12:09 +0000 (19:12 +0000)]
Merge "Fix accidental non-translatable string" into nyc-dev
Jason Monk [Fri, 3 Jun 2016 19:06:56 +0000 (15:06 -0400)]
Fix accidental non-translatable string
Bug:
29034697
Change-Id: If45ef25db1d23fd2ce83ca3119fa63c0ebbcdead
Bill Yi [Fri, 3 Jun 2016 17:09:43 +0000 (10:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iafa80717a736b94e0ef1ccd8eaa42b61379349e2
Auto-generated-cl: translation import
TreeHugger Robot [Fri, 3 Jun 2016 17:02:51 +0000 (17:02 +0000)]
Merge "Avoid triggering device admin settings in non-current user." into nyc-dev
Makoto Onuki [Fri, 3 Jun 2016 00:47:56 +0000 (17:47 -0700)]
Fix RTL layout
Bug
29072224
Change-Id: I414d868b4256e034850a873511bf34d9430842dc
Fyodor Kupolov [Thu, 2 Jun 2016 22:30:22 +0000 (22:30 +0000)]
Merge "Make prefs without an action unselectable" into nyc-dev
Sudheer Shanka [Thu, 2 Jun 2016 19:40:22 +0000 (12:40 -0700)]
Avoid triggering device admin settings in non-current user.
Bug:
28953755
Change-Id: Ic9f6f57b1ef4cc1de2d1ea227b17faf4334ffec8
Fyodor Kupolov [Thu, 2 Jun 2016 17:39:33 +0000 (10:39 -0700)]
Make prefs without an action unselectable
Setting selectable=false is required for proper A11y. Otherwise Talkback
will inform the user that the item can be activated.
Bug:
29025567
Change-Id: I2b61c622c2d69fa83640f7822349613f51f849d5
Wei Wang [Thu, 2 Jun 2016 17:14:02 +0000 (17:14 +0000)]
Merge "Revert "Add an entry in developer options for location tools."" into nyc-dev
Wei Wang [Thu, 2 Jun 2016 04:42:02 +0000 (04:42 +0000)]
Revert "Add an entry in developer options for location tools."
Bug:
28251942
This reverts commit
e1c1a13cba6d1d8d3ffe9f2031f6234dc4bc467d.
Change-Id: I864a813e8f6a9488b4db2f876a0097e947ceae45
Jason Monk [Wed, 1 Jun 2016 20:09:00 +0000 (20:09 +0000)]
Merge "onResume -> onStart, onPause -> onStop" into nyc-dev
TreeHugger Robot [Wed, 1 Jun 2016 18:16:21 +0000 (18:16 +0000)]
Merge "Start DeviceAdminSettings in a new task from support dialog." into nyc-dev
Jason Monk [Wed, 1 Jun 2016 17:45:25 +0000 (13:45 -0400)]
onResume -> onStart, onPause -> onStop
For SettingsActivity and DashboardSummary
Bug:
28896214
Change-Id: I235d5c82b04b1363bf4416acb5cf5fc1c4db704f
Jason Monk [Wed, 1 Jun 2016 17:27:49 +0000 (17:27 +0000)]
Merge "Fix some top-level settings not updating with language" into nyc-dev
Jason Monk [Wed, 1 Jun 2016 17:19:56 +0000 (17:19 +0000)]
Merge "Cache account prefs so we don't lose a11y focus" into nyc-dev
Jason Monk [Tue, 31 May 2016 20:18:17 +0000 (16:18 -0400)]
Cache account prefs so we don't lose a11y focus
Fixes:
28767151
Change-Id: I876712c42b02bb2efaaa492ad951ad42935ecb32
Jason Monk [Wed, 1 Jun 2016 17:03:54 +0000 (17:03 +0000)]
Merge "Fix apps spinner jank." into nyc-dev
Jason Monk [Wed, 1 Jun 2016 16:44:44 +0000 (12:44 -0400)]
Fix apps spinner jank.
Change-Id: I7fbe580627538037fd0f1823787f7dcebbb43252
Fixes:
29056706
Sudheer Shanka [Tue, 31 May 2016 18:50:18 +0000 (11:50 -0700)]
Start DeviceAdminSettings in a new task from support dialog.
Bug:
28998790
Change-Id: Ia43d6e719124e0908ec8ccb8c1ba7e80b5297096
TreeHugger Robot [Wed, 1 Jun 2016 15:14:12 +0000 (15:14 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Wed, 1 Jun 2016 13:23:22 +0000 (06:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: I19e1428a2e4ec2971c4aa611345a3372cc7ef4e3
Auto-generated-cl: translation import
Robin Lee [Fri, 20 May 2016 14:44:08 +0000 (15:44 +0100)]
Disable restricted VPN actions onResume
Otherwise it's pretty easy to circumvent any future restrictions by
keeping VPN settings for a particular app open and continuing to use
it even after DISALLOW_CONFIG_VPN is applied.
Two checks:
1) in onResume (catches almost every case)
2) in setAlwaysOn (catches every remaining case)
Bug:
28733079
Change-Id: I1c67bb14891ef620df5ed65fbd32678e417b4a65
Victor Chang [Wed, 1 Jun 2016 10:07:16 +0000 (10:07 +0000)]
Merge "Show different strings when PO/DO user approves a cert" into nyc-dev
Tony Mak [Wed, 1 Jun 2016 09:36:51 +0000 (09:36 +0000)]
Merge "Fix RTL issue in Trusted Credentail page" into nyc-dev
Victor Chang [Tue, 31 May 2016 21:07:20 +0000 (22:07 +0100)]
Show different strings when PO/DO user approves a cert
1. This is confusing for restricted users who don't have any options other
than 'Trust'.
2. show dialog title of "Check certificate" instead of "Trust or remove certificate"
The change only applies to ProfileOwner and DeviceOwner case
Fix:
28875819
Change-Id: I3f7dc8f3dcac75b4d99814cbc9af67433676a8c7
Tony Mak [Tue, 31 May 2016 19:51:01 +0000 (20:51 +0100)]
Fix RTL issue in Trusted Credentail page
Two changes are required to fix the issue.
1. The width of the textview needed to be wrap_content in order
to resolve the random issue. I guess it is a framework bug, but
anyway the UI looks the same after the change
2. textAlignment="viewStart" is needed to make the textview RTL
3. Clean up: Change the RelativeLayout to a vertical LinearLayout
Bug:
28757193
Change-Id: I1142d4dd31eb86b80f5a2316c1c7825df287b609
Jason Monk [Tue, 31 May 2016 18:49:03 +0000 (14:49 -0400)]
Fix some top-level settings not updating with language
They need to be resources so they can load correctly on locale
change.
Change-Id: Iea167b8df411528185987d37704717d9c0b9f254
Fixes:
28861758
TreeHugger Robot [Tue, 31 May 2016 16:22:39 +0000 (16:22 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Roozbeh Pournader [Tue, 31 May 2016 01:02:41 +0000 (01:02 +0000)]
Merge "Show only up to two locales in Settings" into nyc-dev
Bill Yi [Mon, 30 May 2016 19:06:25 +0000 (12:06 -0700)]
Import translations. DO NOT MERGE
Change-Id: If3ccb0d85f8c6ab4d8c4968445989fd0083fcbe9
Auto-generated-cl: translation import
Jason Monk [Fri, 27 May 2016 17:07:23 +0000 (17:07 +0000)]
Merge "Fix pref availability for search" into nyc-dev
Jason Monk [Fri, 27 May 2016 16:58:53 +0000 (12:58 -0400)]
Fix pref availability for search
Change-Id: Ic080e131c6c751456b22d370aade77748d912b6b
Fixes:
28987828
Jason Monk [Fri, 27 May 2016 16:51:59 +0000 (16:51 +0000)]
Merge "Don't allow restricted data usage of system" into nyc-dev
Jason Monk [Fri, 27 May 2016 14:57:10 +0000 (10:57 -0400)]
Don't allow restricted data usage of system
Cause it will just crash
Change-Id: I4ee43633eb3fa488816b1d2767073cbe404c2c33
Fixes:
28979013
Roozbeh Pournader [Fri, 27 May 2016 02:01:06 +0000 (19:01 -0700)]
Show only up to two locales in Settings
The list could otherwise grow very long, spamming the screen.
Bug:
28872122
Change-Id: I8c4dbe659e1c088eba8b5ba1b2905b5eb8bc0229
Roozbeh Pournader [Fri, 27 May 2016 00:11:47 +0000 (00:11 +0000)]
Merge "Force dashboard summary to single-line and ellipsize it" into nyc-dev
Roozbeh Pournader [Wed, 25 May 2016 21:33:20 +0000 (14:33 -0700)]
Force dashboard summary to single-line and ellipsize it
Previously, the summary could become multiline. In rare combinations
of text and screen width, to indicate to the user that the text is
cut, we now ellipsize it too. Finally, since the ellipsis can get
too close to the end of the line, we add a padding equal to the left
margin of the icon.
Bug:
28872122
Change-Id: I27226e5de7781cf096508ddbef4f9095961ce028
Maurice Lam [Thu, 26 May 2016 23:46:06 +0000 (23:46 +0000)]
Merge "Add activity label to encryption interstitial" into nyc-dev
TreeHugger Robot [Thu, 26 May 2016 17:07:20 +0000 (17:07 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Julia Reynolds [Thu, 26 May 2016 16:50:56 +0000 (16:50 +0000)]
Merge "Importance slider updates." into nyc-dev
Jason Monk [Thu, 26 May 2016 16:46:51 +0000 (16:46 +0000)]
Merge "Fix crash from battery saver switch" into nyc-dev
Julia Reynolds [Thu, 26 May 2016 15:08:16 +0000 (11:08 -0400)]
Importance slider updates.
Icon & tint.
Bug:
28911161
Change-Id: Ic56270c8803557863f914ee0eaf6801f1341387d
Jason Monk [Thu, 26 May 2016 15:07:53 +0000 (11:07 -0400)]
Fix crash from battery saver switch
Turns out most things expect the conditions to be loaded immediately
so if the dashboard hasn't been hit, they crash. Instead load
immediately for everything but the dashboard.
Change-Id: Iaa1114c88b3766e2ac513acb417ef2a55a0f4e7f
Fixes:
28952354
Ricky Wai [Thu, 26 May 2016 13:46:25 +0000 (13:46 +0000)]
Merge "Use LockPatternUtils.resetKeyStore() to clear keystore" into nyc-dev
Victor Chang [Thu, 26 May 2016 10:55:26 +0000 (10:55 +0000)]
Merge "Fix Work Challenge / personal confirm credential is shown on top of keyguard after rotation" into nyc-dev
Derek Tan [Wed, 25 May 2016 23:41:19 +0000 (23:41 +0000)]
Merge "Use getConfigForSubId instead of getConfig(int)." into nyc-dev
Bill Yi [Wed, 25 May 2016 23:07:25 +0000 (16:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: I62ad1f9b258253eda03814f9a7bd93986c85f902
Auto-generated-cl: translation import
TreeHugger Robot [Wed, 25 May 2016 23:07:00 +0000 (23:07 +0000)]
Merge "Guard against IllegalArgumentException" into nyc-dev
Derek Tan [Wed, 25 May 2016 22:00:27 +0000 (15:00 -0700)]
Use getConfigForSubId instead of getConfig(int).
Per API review, we want to revert getConfig(int) to
getConfigForSubId(int) (ag/
1075011). This CL changes all
callers to use getConfigForSubId(int).
Bug:
28295813
Change-Id: I0e44a5e758aed34ce26740632270700bde66cff6
Robin Lee [Wed, 25 May 2016 21:05:53 +0000 (21:05 +0000)]
Merge "Don't crash trying to disable lockdown VPN" into nyc-dev
Sudheer Shanka [Wed, 25 May 2016 20:17:12 +0000 (13:17 -0700)]
Guard against IllegalArgumentException
Bug:
28742227
Change-Id: If436ec3f743ca11ea40dce2033b7b993cb6ad170
TreeHugger Robot [Wed, 25 May 2016 18:27:29 +0000 (18:27 +0000)]
Merge "Skip indexing content while user is locked." into nyc-dev
Jason Monk [Wed, 25 May 2016 16:53:34 +0000 (12:53 -0400)]
Don't update conditions on background threads
Instead build a list and set it on the main thread to avoid
concurrent modification crashes.
Change-Id: I936fbeb70359583e55ae8ddcb0ea46b5753cb3b0
Fixes:
28794277
Jeff Sharkey [Wed, 25 May 2016 16:52:33 +0000 (10:52 -0600)]
Skip indexing content while user is locked.
Otherwise we try touching printing services which throw.
Bug:
28912897
Change-Id: I25638794b35fd383fbe67604ac921d16743628ad
Ricky Wai [Tue, 24 May 2016 18:28:53 +0000 (19:28 +0100)]
Hide work profile key in user credentials screen
Bug:
28878708
Change-Id: Ic9733ea973e1cc37028cb5f740969b5e24fb5aef
Maurice Lam [Wed, 25 May 2016 03:03:08 +0000 (20:03 -0700)]
Add activity label to encryption interstitial
So that TalkBack refers to the screen by this more specific name.
Bug:
28868846
Change-Id: I93139959dcdbd156d57f01699283e01b178305b8
TreeHugger Robot [Wed, 25 May 2016 00:17:20 +0000 (00:17 +0000)]
Merge "Remove option to configure emergency app" into nyc-dev
Victor Chang [Tue, 24 May 2016 14:46:55 +0000 (15:46 +0100)]
Fix Work Challenge / personal confirm credential is shown on top of keyguard after rotation
ConfirmDeviceCredentialBaseFragment.SHOW_WHEN_LOCKED has been abused.
We should not set onfirmDeviceCredentialBaseFragment.SHOW_WHEN_LOCKED
for work challenge and most other cases.
It's temp fix for the rotation bug. Because it's inconsistent the activity is shown
on top of keyguard with/without rotation (or any config change). In long term,
SHOW_WHEN_LOCKED should be set only if it's truly on purpose, and remove
isKeyguardLocked checking.
Bug:
28878075
Change-Id: I19db913f5bcaf2644c8c46c25e9584103d7fee8a
Victor Chang [Tue, 24 May 2016 14:03:28 +0000 (14:03 +0000)]
Merge "Trust the certificate after unlocking screenlock" into nyc-dev
Ricky Wai [Tue, 24 May 2016 10:13:56 +0000 (11:13 +0100)]
Use LockPatternUtils.resetKeyStore() to clear keystore
Bug:
28878708
Change-Id: I6730b6947ea917772809bb045470bdf5e95d86ba
Victor Chang [Mon, 23 May 2016 18:47:38 +0000 (19:47 +0100)]
Trust the certificate after unlocking screenlock
When trust button is clicked, if ConfirmCredential (CC) is shown,
and user successfully unlock CC, trust the cert immediately
Bug:
28752364
Change-Id: Ied4aeda59a668a9dd2bf079a385b1fecd8eabb9e
TreeHugger Robot [Mon, 23 May 2016 15:35:34 +0000 (15:35 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Mon, 23 May 2016 13:45:55 +0000 (13:45 +0000)]
Merge "Fixed whitelist stats so it's only logged on add." into nyc-dev
Bill Yi [Mon, 23 May 2016 13:35:00 +0000 (06:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: I18ff7e3d70d30e76e01214b31c1df2065209f30f
Auto-generated-cl: translation import
Victor Chang [Mon, 23 May 2016 11:51:54 +0000 (11:51 +0000)]
Merge "Fix Continous loop in unifed screenlock when trying to Trust a CA cert" into nyc-dev
Baligh Uddin [Sat, 21 May 2016 20:10:17 +0000 (13:10 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
28857042
Change-Id: I2ef0467d8a959436073642564afcb8fd25d3d09e