Tony Mak
403dcb01a9
Merge "Update string for work challenge" into nyc-dev am: 6b9aa35
...
am: f39379e
* commit 'f39379e9edd9b2f50f9e3ff76dcf95025f47a48b':
Update string for work challenge
Change-Id: Id477b96895a9fe20e299b480b6dfeeb1346d9e30
2016-04-25 17:15:28 +00:00
Alan Viverette
b935f2f67d
Remove -night qualified resources
...
Bug: 28358465
Change-Id: I276076b35eb946e600b4540c184fc0605d73f7db
2016-04-25 12:55:40 -04:00
Felipe Leme
34c5d3aa86
Fixed context reference.
...
BUG: 27608886
Change-Id: I2d2e2393ce52f4461dce276231cbc90563897ffd
2016-04-25 09:27:40 -07:00
Abodunrinwa Toki
23bd5be378
Make Settings dashboard items focusable.
...
Bug: 27038246
Change-Id: Ied76fc546cacf1dafa4744dfc6e229f249a209d3
2016-04-25 17:21:03 +01:00
Tony Mak
185bfdf3a5
Merge "Update string for work challenge" into nyc-dev
...
am: 6b9aa35
* commit '6b9aa353e8fb773a8fddc58d8ed6c13a766d3752':
Update string for work challenge
Change-Id: I18d307f4aea958fba7d95c630e15016ac6031814
2016-04-25 15:52:52 +00:00
Tony Mak
f39379e9ed
Merge "Update string for work challenge" into nyc-dev
...
am: 6b9aa35
* commit '6b9aa353e8fb773a8fddc58d8ed6c13a766d3752':
Update string for work challenge
Change-Id: Idf773961a3be23573c93fcd50186beaf6f6ce86c
2016-04-25 15:52:51 +00:00
Tony Mak
6b9aa353e8
Merge "Update string for work challenge" into nyc-dev
2016-04-25 15:36:03 +00:00
Ricky Wai
388c54fda1
Merge "Make "work mode on dialog" show personal challenge in unified work lock" into nyc-dev am: 0858ce1
...
am: a4cacbd
* commit 'a4cacbd7dca4a4bf8f7967b5365922dc5737cf93':
Change-Id: Icc784e1fe3236a2cbc9944861196f8479bddf1c9
2016-04-25 13:29:51 +00:00
Ricky Wai
1a8792d5f0
Merge "Make "work mode on dialog" show personal challenge in unified work lock" into nyc-dev am: 0858ce1
...
am: 3f29124
* commit '3f291245a8dbb6a429646e8fcf36fa91fbbc3fd9':
Make "work mode on dialog" show personal challenge in unified work lock
Change-Id: I87053df8f8f98803686a265c01bd7bf8f4f64337
2016-04-25 13:27:24 +00:00
Ricky Wai
a4cacbd7dc
Merge "Make "work mode on dialog" show personal challenge in unified work lock" into nyc-dev
...
am: 0858ce1
* commit '0858ce1488b7cd916b565956b7c0bcc8a699ab27':
Make "work mode on dialog" show personal challenge in unified work lock
Change-Id: If1d5da67189a8eae98769c1f0c859c5d8e8d5290
2016-04-25 13:23:05 +00:00
Ricky Wai
3f291245a8
Merge "Make "work mode on dialog" show personal challenge in unified work lock" into nyc-dev
...
am: 0858ce1
* commit '0858ce1488b7cd916b565956b7c0bcc8a699ab27':
Make "work mode on dialog" show personal challenge in unified work lock
Change-Id: Idb75d79eacebbdced021c1b96d73357b0e54a281
2016-04-25 13:23:03 +00:00
Bill Yi
b427fe5baf
Import translations. DO NOT MERGE am: af3dce8
-s ours
...
am: cfc670c
-s ours
* commit 'cfc670c45425852e053e54f6860fc4b4f91715d5':
Change-Id: I56ca768880986cc3e15752d280839d5abe730129
2016-04-25 13:20:19 +00:00
Bill Yi
aa6515524f
Import translations. DO NOT MERGE am: af3dce8
-s ours
...
am: a66bc31
-s ours
* commit 'a66bc31cc4023d033a49287b8cc2cde795739300':
Import translations. DO NOT MERGE
Change-Id: Ie9a50ae981d4d923310dfd83d64dfba4e314e8ae
2016-04-25 13:14:30 +00:00
Ricky Wai
0858ce1488
Merge "Make "work mode on dialog" show personal challenge in unified work lock" into nyc-dev
2016-04-25 13:11:45 +00:00
Bill Yi
cfc670c454
Import translations. DO NOT MERGE
...
am: af3dce8
-s ours
* commit 'af3dce8ce599f53a731838f6da12f233081bdd1e':
Import translations. DO NOT MERGE
Change-Id: I25f78795faa2a8d4db43fe3146e2bd66bf0d6731
2016-04-25 13:09:23 +00:00
Bill Yi
a66bc31cc4
Import translations. DO NOT MERGE
...
am: af3dce8
-s ours
* commit 'af3dce8ce599f53a731838f6da12f233081bdd1e':
Import translations. DO NOT MERGE
Change-Id: I1e45f679fccd258dd6c788bbedcf8d827b75f1a1
2016-04-25 13:09:19 +00:00
Bill Yi
af3dce8ce5
Import translations. DO NOT MERGE
...
Change-Id: I120bc8d7a5dfc7c7f9807c57862be80699ed1ada
Auto-generated-cl: translation import
2016-04-24 22:35:45 -07:00
Dan Sandler
12c4ba4224
Developer QS tile: GPU Profiling.
...
Bug: 27872042
Change-Id: Ia57005df15572b1714af2a3a8cd5b9794fdfb165
2016-04-24 10:55:41 -04:00
Dan Sandler
3bd52ddf4c
Developer QS tile: Show Layout.
...
Bug: 27872042
Change-Id: I0df2ffecbf7d2682d89c9b8343590bb04bcc305c
2016-04-24 10:53:52 -04:00
Android Build Merger (Role)
d290ca7821
Merge "Merge "Cleanup of the PackageInstaller API - Settings" into nyc-dev am: c8d363e
am: 4143228" into nyc-mr1-dev-plus-aosp
2016-04-22 23:33:23 +00:00
Svetoslav Ganov
ff6d678262
Merge "Cleanup of the PackageInstaller API - Settings" into nyc-dev am: c8d363e
...
am: 4143228
* commit '4143228b47c12806865b156f261a85bd0d8e9c4e':
Cleanup of the PackageInstaller API - Settings
Change-Id: I166da8b6a052e5899c2d7e94e96a942979293e43
2016-04-22 23:33:16 +00:00
Svetoslav Ganov
a2a0298f23
Merge "Cleanup of the PackageInstaller API - Settings" into nyc-dev am: c8d363e
...
am: 5658e57
* commit '5658e577f3ddb544745b5f73e53cb6e4f3a58200':
Cleanup of the PackageInstaller API - Settings
Change-Id: I5a688a15ef742a6d7ec3300cc67d17be761ae426
2016-04-22 23:33:13 +00:00
Svetoslav Ganov
5658e577f3
Merge "Cleanup of the PackageInstaller API - Settings" into nyc-dev
...
am: c8d363e
* commit 'c8d363e24c4906f2a9d261d46503f16b4b63bccd':
Cleanup of the PackageInstaller API - Settings
Change-Id: Ie4352dff2c554c760a78b8d071ffaf29b3720e2a
2016-04-22 23:30:39 +00:00
Svetoslav Ganov
4143228b47
Merge "Cleanup of the PackageInstaller API - Settings" into nyc-dev
...
am: c8d363e
* commit 'c8d363e24c4906f2a9d261d46503f16b4b63bccd':
Cleanup of the PackageInstaller API - Settings
Change-Id: I67ea31a2464101d25b6d80b4b84dad596738e829
2016-04-22 23:30:38 +00:00
Svetoslav Ganov
c8d363e24c
Merge "Cleanup of the PackageInstaller API - Settings" into nyc-dev
2016-04-22 22:18:28 +00:00
Felipe Leme
3ce03d13e8
Merge "Disable tethering when Data Saver mode is on." into nyc-dev am: 1d3f1e0
...
am: cd57db7
* commit 'cd57db78b051ebee2509d26253bf7c4954c85f18':
Change-Id: I2b4998ecbd61ba84502ffb85f09a4cb311c19447
2016-04-22 21:47:00 +00:00
Felipe Leme
048e5a0b99
Merge "Disable tethering when Data Saver mode is on." into nyc-dev am: 1d3f1e0
...
am: 06fb22d
* commit '06fb22dd19017439849625a88f57e741dfd5ad46':
Disable tethering when Data Saver mode is on.
Change-Id: Iadff2074da9d7f04b51292c7ed33c20d96ada623
2016-04-22 21:46:21 +00:00
Felipe Leme
06fb22dd19
Merge "Disable tethering when Data Saver mode is on." into nyc-dev
...
am: 1d3f1e0
* commit '1d3f1e0fde8538ba0edd54009931edd48c097fe0':
Disable tethering when Data Saver mode is on.
Change-Id: I8d8f59aa6726c4e47f0b7ed26400645ce1e97d6c
2016-04-22 21:43:50 +00:00
Felipe Leme
cd57db78b0
Merge "Disable tethering when Data Saver mode is on." into nyc-dev
...
am: 1d3f1e0
* commit '1d3f1e0fde8538ba0edd54009931edd48c097fe0':
Disable tethering when Data Saver mode is on.
Change-Id: I6de8bec1c969a1fe7a1d1b8bf5d8587d2c0fc6f1
2016-04-22 21:43:50 +00:00
Felipe Leme
1d3f1e0fde
Merge "Disable tethering when Data Saver mode is on." into nyc-dev
2016-04-22 21:39:51 +00:00
Felipe Leme
5c09184e00
Disable tethering when Data Saver mode is on.
...
BUG: 28313291
Change-Id: Idbedd440a1baa41f1407b32e86f5ae0080e60798
2016-04-22 14:25:35 -07:00
Philip P. Moltmann
80edf51d63
Merge "Update print jobs appropriately in the print settings." into nyc-dev am: badb762
...
am: 558c541
* commit '558c541f05443620b5b4a7032502b360cf44d84c':
Change-Id: If23cb8a2de630cf09f730ff9b39f2efb96743b1c
2016-04-22 18:54:02 +00:00
Philip P. Moltmann
d60d2c25d1
Merge "Update print jobs appropriately in the print settings." into nyc-dev am: badb762
...
am: 04b28dd
* commit '04b28dde9bf983bc7c0b6ee3f878d6148ad54eee':
Update print jobs appropriately in the print settings.
Change-Id: I70ec2fd543967a906e01fc34a0f93c909fb4a906
2016-04-22 18:49:01 +00:00
Philip P. Moltmann
04b28dde9b
Merge "Update print jobs appropriately in the print settings." into nyc-dev
...
am: badb762
* commit 'badb762523ae7cebf6db98f5a590f403893a7d99':
Update print jobs appropriately in the print settings.
Change-Id: Ib1eb53c336d63543333d83fc25cfd55fac1f6bfb
2016-04-22 18:41:29 +00:00
Philip P. Moltmann
558c541f05
Merge "Update print jobs appropriately in the print settings." into nyc-dev
...
am: badb762
* commit 'badb762523ae7cebf6db98f5a590f403893a7d99':
Update print jobs appropriately in the print settings.
Change-Id: Ie353c3ed8956fe8587de16db4e30be6a318a016b
2016-04-22 18:41:12 +00:00
Daniel Nishi
52ee1c76de
Fix a whitespace issue in ManageApplications.
...
am: 9412c5a6e2
* commit '9412c5a6e24092ac5ae23e000bf1ae3c1455df11':
Fix a whitespace issue in ManageApplications.
Change-Id: I585eaa6bde12eb70f3150c11fc0ffcee4f5909f2
2016-04-22 17:34:44 +00:00
Philip P. Moltmann
badb762523
Merge "Update print jobs appropriately in the print settings." into nyc-dev
2016-04-22 17:32:36 +00:00
Tony Mak
f70b46872a
Update string for work challenge
...
Also, increase the char limit to 100.
Change-Id: I2d896a0d942767ec949bc235b16c824e0c6f80c7
Fix: 28204828
2016-04-22 18:30:49 +01:00
Daniel Nishi
9412c5a6e2
Fix a whitespace issue in ManageApplications.
...
Change-Id: I730d9737f801dfb29172e71fc5f32a310b8e0cc4
(cherry picked from commit cce1a3189a
)
2016-04-22 17:10:51 +00:00
Robin Lee
f8b622d8c7
Merge "Change VPN failure notification to dialog" into nyc-dev am: dc1e59a314
...
am: 2bffd33441
* commit '2bffd3344108c98bae072a4e2702905d76bcb295':
Change-Id: I4b984e325d9b5af67637cf0de14e3af3c12351f1
2016-04-22 16:12:00 +00:00
Jason Monk
48f7805243
Merge "Increase secondary text contrast on conditionals" into nyc-dev am: 7e61f71bcc
...
am: 182abfa24f
* commit '182abfa24f44ed9242815397de2d011f0ac52d4c':
Change-Id: If2e77c7ea6ce426e955dc71fd25d351866d8403a
2016-04-22 16:12:00 +00:00
Jason Monk
941b1ee9d9
Merge "Attempt to fix receiver registering problems" into nyc-dev am: 8dbc166353
...
am: 762f0e137c
* commit '762f0e137c350ab5de3a663e1a20bdc790703b76':
Change-Id: I6dd6c35844cfe32843f64cb3302da058bbb8ac7d
2016-04-22 16:11:59 +00:00
Jason Monk
fecd89f099
Merge "Don\'t link to MobileNetworkSettings unless admin user" into nyc-dev am: af6236d06f
...
am: 700da14d84
* commit '700da14d84deea6c6396ee40a324d8b3c4aa6118':
Change-Id: Idd6d22440f0863fcb30663114ab07ac08a4a9303
2016-04-22 16:11:58 +00:00
Robin Lee
3754be20a5
Merge "Change VPN failure notification to dialog" into nyc-dev am: dc1e59a314
...
am: c9bc607505
* commit 'c9bc6075055e99f09c4b8d638ccf00ee279ed5a3':
Change VPN failure notification to dialog
Change-Id: I88ab3523a9f98e44e7c356e60ef989e432efa88e
2016-04-22 16:11:07 +00:00
Jason Monk
39ea5292a3
Merge "Increase secondary text contrast on conditionals" into nyc-dev am: 7e61f71bcc
...
am: edc7f834ac
* commit 'edc7f834ac58950875313d9704c0e778a5a90095':
Increase secondary text contrast on conditionals
Change-Id: I862b6003c6acb637020652951376d80b718c4bc4
2016-04-22 16:11:06 +00:00
Jason Monk
9e10f10a4f
Merge "Attempt to fix receiver registering problems" into nyc-dev am: 8dbc166353
...
am: 5fddbcd846
* commit '5fddbcd846aefdd875b6dd7709d3724591cba06d':
Attempt to fix receiver registering problems
Change-Id: Ib861c6aef14a2235008d40509cb95b2410f1b069
2016-04-22 16:11:06 +00:00
Jason Monk
5cc3730815
Merge "Don\'t link to MobileNetworkSettings unless admin user" into nyc-dev am: af6236d06f
...
am: 7014023f5d
* commit '7014023f5d291b6bebc0601dd221934c89143716':
Don't link to MobileNetworkSettings unless admin user
Change-Id: I874d3910be0b1c808ab63f6fa9e9dda1a0731a47
2016-04-22 16:11:05 +00:00
Robin Lee
c9bc607505
Merge "Change VPN failure notification to dialog" into nyc-dev
...
am: dc1e59a314
* commit 'dc1e59a3147dfef7c582f2881e25d504025baa6a':
Change VPN failure notification to dialog
Change-Id: I9209c010bd1bf3d0d7b18bef32c05b302354494f
2016-04-22 16:08:56 +00:00
Jason Monk
edc7f834ac
Merge "Increase secondary text contrast on conditionals" into nyc-dev
...
am: 7e61f71bcc
* commit '7e61f71bccee2c3d064e9ce30b9b4a26839db49b':
Increase secondary text contrast on conditionals
Change-Id: I80e4536dab43a38dc70b6766ce1a0c433dba00a6
2016-04-22 16:08:56 +00:00
Jason Monk
5fddbcd846
Merge "Attempt to fix receiver registering problems" into nyc-dev
...
am: 8dbc166353
* commit '8dbc16635341e7c52454d3faf806dc228502f265':
Attempt to fix receiver registering problems
Change-Id: I36fd2eba3c451a3c509ea0e5da9611a91af239e6
2016-04-22 16:08:55 +00:00