Commit Graph

27461 Commits

Author SHA1 Message Date
Tony Mak
6b9aa353e8 Merge "Update string for work challenge" into nyc-dev 2016-04-25 15:36:03 +00:00
Ricky Wai
69ad329fba Merge "Make "work mode on dialog" show personal challenge in unified work lock" into nyc-dev am: 0858ce1 am: a4cacbd
am: 388c54f

* commit '388c54fda1f12d59c2126dc0aeb994b2d59e3266':

Change-Id: I7325474f5c717e24c7b5fcc6b678805be6f0859d
2016-04-25 13:34:41 +00:00
Ricky Wai
e5fed3056c Merge "Make "work mode on dialog" show personal challenge in unified work lock" into nyc-dev am: 0858ce1 am: 3f29124
am: 1a8792d

* commit '1a8792d5f098431a6b37dfad61714cc35501088b':
  Make "work mode on dialog" show personal challenge in unified work lock

Change-Id: Ice29e8c61d21373ea85ba55c1f623236c784c4fa
2016-04-25 13:34:41 +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
Bill Yi
80b21da648 Import translations. DO NOT MERGE am: af3dce8 -s ours am: cfc670c -s ours
am: b427fe5  -s ours

* commit 'b427fe5baf0d2417349ea90c5388650875b654bf':

Change-Id: I77d9f341e2414c9288d648ec44bd599d285c26c0
2016-04-25 13:25:20 +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
e0c124e16e Import translations. DO NOT MERGE am: af3dce8 -s ours am: a66bc31 -s ours
am: aa65155  -s ours

* commit 'aa6515524fddb89412bc5c0c7fe1d1b8a574be27':
  Import translations. DO NOT MERGE

Change-Id: I5339994d67ce90cc57bb5b34f936d22e5ddf5aff
2016-04-25 13:20:03 +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
Bill Yi
13bf29ef30 Import translations. DO NOT MERGE
Change-Id: Ic62f9ca76d5801714036c39a222341c6eb8b7aff
Auto-generated-cl: translation import
2016-04-24 21:56:38 -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
Svetoslav Ganov
9c0a7138e9 Merge "Merge "Cleanup of the PackageInstaller API - Settings" into nyc-dev am: c8d363e am: 4143228" into nyc-mr1-dev-plus-aosp
am: d290ca7

* commit 'd290ca7821a51d38736673c2db047ba510d88c9e':

Change-Id: Ife854223cbf5bc2adefa4594a1f9e91e0bc1d74b
2016-04-22 23:36:14 +00:00
Svetoslav Ganov
1fcb80ed11 Merge "Cleanup of the PackageInstaller API - Settings" into nyc-dev am: c8d363e am: 5658e57
am: a2a0298

* commit 'a2a0298f235a851b28a3ec3abec5091874e8e11f':
  Cleanup of the PackageInstaller API - Settings

Change-Id: Ie4060a29803c96553fd6679398c212620e641fa3
2016-04-22 23:36:13 +00: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
c27eeb0fa7 Merge "Disable tethering when Data Saver mode is on." into nyc-dev am: 1d3f1e0 am: cd57db7
am: 3ce03d1

* commit '3ce03d13e89ee2ebe00541d77d495aab5bd05daa':

Change-Id: I046122932c32a2ebfe7111f4e4d9ec09a5068cfd
2016-04-22 22:05:44 +00:00
Felipe Leme
ff39a834ba Merge "Disable tethering when Data Saver mode is on." into nyc-dev am: 1d3f1e0 am: 06fb22d
am: 048e5a0

* commit '048e5a0b9957e59e26493989b8e6687c6e74af06':
  Disable tethering when Data Saver mode is on.

Change-Id: I542eb6cba7def76e76b5eeada1e3115d88eede7d
2016-04-22 22:05:44 +00:00
Philip P. Moltmann
6b3fe75d21 Merge "Update print jobs appropriately in the print settings." into nyc-dev am: badb762 am: 558c541
am: 80edf51

* commit '80edf51d63edaeec11b094040240b4bda50f4fd2':

Change-Id: I840e46a576a6f189f4e8da4bde2634da25123a56
2016-04-22 22:05:43 +00:00
Philip P. Moltmann
dd642df8c0 Merge "Update print jobs appropriately in the print settings." into nyc-dev am: badb762 am: 04b28dd
am: d60d2c2

* commit 'd60d2c25d15c86b14af2399dc5328020b1eb5bef':
  Update print jobs appropriately in the print settings.

Change-Id: I82655f6f19e0bb68af726c8f38a9099ea6ccd23b
2016-04-22 22:05:42 +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
cc00aba6bf Fix a whitespace issue in ManageApplications. am: 9412c5a6e2
am: 52ee1c76de

* commit '52ee1c76de5cdb992393962c2387d9a981487e8b':
  Fix a whitespace issue in ManageApplications.

Change-Id: I5d37fd3ff24c50b4235c0c1332df43523d31c1b5
2016-04-22 17:37:04 +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
98ca2373a8 Merge "Change VPN failure notification to dialog" into nyc-dev am: dc1e59a314 am: 2bffd33441
am: f8b622d8c7

* commit 'f8b622d8c719669b4867e6162152c6262e1045a4':

Change-Id: I5743c870d5b87e6d9aec77e46af95b3090e8d496
2016-04-22 16:13:47 +00:00
Jason Monk
03acce1e0b Merge "Increase secondary text contrast on conditionals" into nyc-dev am: 7e61f71bcc am: 182abfa24f
am: 48f7805243

* commit '48f780524373633d26365c9edb85d9ad90f3b1ad':

Change-Id: I2fff90d6d814c32f933a428f46632cf2156df3f3
2016-04-22 16:13:47 +00:00
Jason Monk
ef087d6b0c Merge "Attempt to fix receiver registering problems" into nyc-dev am: 8dbc166353 am: 762f0e137c
am: 941b1ee9d9

* commit '941b1ee9d959d9ed0871c61d78c6849df63d4913':

Change-Id: I22de5128ff0ce858641752755f7ccfdca74bafa1
2016-04-22 16:13:46 +00:00
Jason Monk
01801693c4 Merge "Don\'t link to MobileNetworkSettings unless admin user" into nyc-dev am: af6236d06f am: 700da14d84
am: fecd89f099

* commit 'fecd89f099471f3aad8af896c6c0ce255c2ed355':

Change-Id: I3e04d31f3a77d6cb09c81dce5c5d3ea23ad36cfb
2016-04-22 16:13:46 +00:00
Robin Lee
8b1adacb96 Merge "Change VPN failure notification to dialog" into nyc-dev am: dc1e59a314 am: c9bc607505
am: 3754be20a5

* commit '3754be20a53a332d3f613ce410a9300a3cc9d65d':
  Change VPN failure notification to dialog

Change-Id: Iaeb8b4436fb58f1d61596c155c47ab2e16589fe4
2016-04-22 16:13:45 +00:00