163708 Commits

Author SHA1 Message Date
Jason Monk
0ac63669b1 am 057fd382: am 9df42df2: Merge "Keyguard: Use plmn/spn broadcast when no SIMs" into lmp-mr1-dev
* commit '057fd382cc26ff85db397835fdd3b7e5c73ef336':
  Keyguard: Use plmn/spn broadcast when no SIMs
2015-02-26 23:18:53 +00:00
Jason Monk
057fd382cc am 9df42df2: Merge "Keyguard: Use plmn/spn broadcast when no SIMs" into lmp-mr1-dev
* commit '9df42df2bca0a7a91d813b19e084069675d4057b':
  Keyguard: Use plmn/spn broadcast when no SIMs
2015-02-26 21:59:06 +00:00
Jason Monk
9df42df2bc Merge "Keyguard: Use plmn/spn broadcast when no SIMs" into lmp-mr1-dev 2015-02-26 21:54:23 +00:00
Rich Slogar
b8b1e07668 am efda11e7: am 328dc428: am 6bb23d62: am 29936684: am 0a504745: Merge "docs: 9patch tool update" into lmp-docs
* commit 'efda11e708cf39ac408fc1189f9a58b3c66b0831':
  docs: 9patch tool update
2015-02-26 18:37:38 +00:00
Rich Slogar
efda11e708 am 328dc428: am 6bb23d62: am 29936684: am 0a504745: Merge "docs: 9patch tool update" into lmp-docs
* commit '328dc4288bc86b6f7a7db56d7bfb17053e94ec1c':
  docs: 9patch tool update
2015-02-26 18:30:32 +00:00
Rich Slogar
328dc4288b am 6bb23d62: am 29936684: am 0a504745: Merge "docs: 9patch tool update" into lmp-docs
* commit '6bb23d627f608461f6dd5f40308ac176a327d99b':
  docs: 9patch tool update
2015-02-26 18:22:34 +00:00
Rich Slogar
6bb23d627f am 29936684: am 0a504745: Merge "docs: 9patch tool update" into lmp-docs
* commit '299366847f50059fb3e13b573247d9a05d29eb3c':
  docs: 9patch tool update
2015-02-26 18:15:41 +00:00
Rich Slogar
299366847f am 0a504745: Merge "docs: 9patch tool update" into lmp-docs
* commit '0a504745b4f63bd9f1d5e40addf50a6e90b8522d':
  docs: 9patch tool update
2015-02-26 18:08:39 +00:00
Rich Slogar
0a504745b4 Merge "docs: 9patch tool update" into lmp-docs 2015-02-26 18:02:43 +00:00
Rich Slogar
fa514d6907 am 5b3b1a17: am bd409177: am 1836eea0: am 41104632: am eedf6ad8: Merge "docs: remove exploring sdk link" into lmp-docs
* commit '5b3b1a17da0f59ee7a0b4c4defb1993b9de85b3f':
  docs: remove exploring sdk link
2015-02-25 23:46:45 +00:00
Rich Slogar
1e72a9b247 am 2ed2c141: am 81049aff: am f8a95b0b: am 84994e87: am db2ebca7: Merge "docs: note to install linux packages v2 update" into lmp-docs
* commit '2ed2c141f338bef0f11ae93167b7c810bbbd645d':
  docs: note to install linux packages v2 update
2015-02-25 23:46:41 +00:00
Rich Slogar
5b3b1a17da am bd409177: am 1836eea0: am 41104632: am eedf6ad8: Merge "docs: remove exploring sdk link" into lmp-docs
* commit 'bd409177ec6b422e18d9e0c94ffab86dfd368976':
  docs: remove exploring sdk link
2015-02-25 23:38:55 +00:00
Rich Slogar
2ed2c141f3 am 81049aff: am f8a95b0b: am 84994e87: am db2ebca7: Merge "docs: note to install linux packages v2 update" into lmp-docs
* commit '81049aff4bad07427dc18543be1c759e16267a63':
  docs: note to install linux packages v2 update
2015-02-25 23:38:51 +00:00
Rich Slogar
bd409177ec am 1836eea0: am 41104632: am eedf6ad8: Merge "docs: remove exploring sdk link" into lmp-docs
* commit '1836eea08229dda72ff89d24f75f9f4948be957e':
  docs: remove exploring sdk link
2015-02-25 23:32:51 +00:00
Rich Slogar
81049aff4b am f8a95b0b: am 84994e87: am db2ebca7: Merge "docs: note to install linux packages v2 update" into lmp-docs
* commit 'f8a95b0b6fc4e19c7935a2fb46c5b7b6cef3a194':
  docs: note to install linux packages v2 update
2015-02-25 23:32:46 +00:00
Rich Slogar
1836eea082 am 41104632: am eedf6ad8: Merge "docs: remove exploring sdk link" into lmp-docs
* commit '411046324743055e9eef3b04109c998b5354b496':
  docs: remove exploring sdk link
2015-02-25 23:25:11 +00:00
Rich Slogar
f8a95b0b6f am 84994e87: am db2ebca7: Merge "docs: note to install linux packages v2 update" into lmp-docs
* commit '84994e876e728fa57f06d803f7c4abfbc9df40db':
  docs: note to install linux packages v2 update
2015-02-25 23:25:07 +00:00
Rich Slogar
4110463247 am eedf6ad8: Merge "docs: remove exploring sdk link" into lmp-docs
* commit 'eedf6ad8ce1e15276311a78488e27388f049b4c0':
  docs: remove exploring sdk link
2015-02-25 23:17:31 +00:00
Rich Slogar
84994e876e am db2ebca7: Merge "docs: note to install linux packages v2 update" into lmp-docs
* commit 'db2ebca7ed10a4d5d943e414a35d4734b9987e91':
  docs: note to install linux packages v2 update
2015-02-25 23:17:23 +00:00
Rich Slogar
eedf6ad8ce Merge "docs: remove exploring sdk link" into lmp-docs 2015-02-25 23:12:37 +00:00
Rich Slogar
db2ebca7ed Merge "docs: note to install linux packages v2 update" into lmp-docs 2015-02-25 23:11:24 +00:00
Filip Gruszczynski
1e74b5d6b0 Merge "Burn in protection." into lmp-mr1-modular-dev 2015-02-25 21:31:53 +00:00
Filip Gruszczynski
d2e8640c2c Burn in protection.
Bug: 19373758
Change-Id: I7242f73acadd21bdee03262b4205c8af0734fccb
2015-02-25 12:22:49 -08:00
Griff Hazen
aeffc9cebd Merge "Always draw the circular emulator overlay with square dimensions" into lmp-mr1-modular-dev 2015-02-25 19:39:56 +00:00
Filip Gruszczynski
01dd0e8654 Merge "Force translucency from windowIsTranslucent on SwipeDismissLayout." into lmp-mr1-modular-dev 2015-02-25 18:40:20 +00:00
Jim Miller
91aa1bdb57 am 19847b07: am b46e4806: Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev
* commit '19847b07e81b9b29e3574ce6ab8acf7a958a1a63':
  Remove TrustAgent whitelisting API
2015-02-25 18:17:13 +00:00
Jim Miller
19847b07e8 am b46e4806: Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev
* commit 'b46e48067fd03b63fa5f5191651ac2a5d009e226':
  Remove TrustAgent whitelisting API
2015-02-25 18:09:54 +00:00
Jim Miller
b46e48067f Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev 2015-02-25 18:04:58 +00:00
Geoff Mendal
6715b9dda1 am bb463806: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit 'bb463806aa9a83d10cfff5f565eebd71d500ae4e':
  Import translations. DO NOT MERGE
2015-02-25 15:47:38 +00:00
Geoff Mendal
bb463806aa Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2015-02-25 15:41:24 +00:00
Geoff Mendal
70228b3929 Import translations. DO NOT MERGE
Change-Id: I4e5b922995cf7eff9c984735209e2fe073fb5d83
Auto-generated-cl: translation import
2015-02-25 07:39:28 -08:00
Geoff Mendal
28e4a357ce am c2cbbb89: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit 'c2cbbb89061d45dfe4ec84c3bf5304e76ac6ef64':
  Import translations. DO NOT MERGE
2015-02-25 14:13:06 +00:00
Geoff Mendal
6d471d04b0 am a4f54454: (-s ours) Import translations. DO NOT MERGE
* commit 'a4f544540ebe27aca15305dd8f5bda5b5d10283b':
  Import translations. DO NOT MERGE
2015-02-25 14:13:00 +00:00
Geoff Mendal
c2cbbb8906 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2015-02-25 14:09:55 +00:00
Geoff Mendal
ecac2cb4d2 Import translations. DO NOT MERGE
Change-Id: I84339eebbf7a8e2332e85a104b85ec740a25d6f1
Auto-generated-cl: translation import
2015-02-25 06:08:29 -08:00
Geoff Mendal
a4f544540e Import translations. DO NOT MERGE
Change-Id: I5974f01d8313faa999068ffd844ecbafb9ab4321
Auto-generated-cl: translation import
2015-02-25 06:02:34 -08:00
Geoff Mendal
aee4a86a04 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-25 13:45:21 +00:00
Geoff Mendal
ce64b99e44 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-25 13:44:55 +00:00
Geoff Mendal
91d95328da Import translations. DO NOT MERGE
Change-Id: I077436f56f383af0746ee1c7037ba8bef0d1d6d6
Auto-generated-cl: translation import
2015-02-25 07:41:18 -06:00
Geoff Mendal
5d7482adc1 Import translations. DO NOT MERGE
Change-Id: Ib4c512a4856bdce8518bf1ee1a36ca5fc19a324b
Auto-generated-cl: translation import
2015-02-25 05:41:09 -08:00
Geoff Mendal
53ddd69ea7 Import translations. DO NOT MERGE
Change-Id: I14e100832a693f7e5cfa8d53edd90ebb1745c064
Auto-generated-cl: translation import
2015-02-25 05:35:06 -08:00
Joe Fernandez
4e3e6fb16e am 9afbbb2e: am 8ffb574a: am f7224396: am c427b721: am 41418826: Merge "docs: Android for Work developer landing page" into lmp-docs
* commit '9afbbb2e600936ef7a402fecd0402a3e59cf864e':
  docs: Android for Work developer landing page
2015-02-25 13:27:07 +00:00
Andrew Solovay
2557fb070a am d7cddbd2: am 7391b0a1: am e64301e6: am 790b1bc8: am d3cd0948: docs: New doc for creating an AfW Work Policy Controller
* commit 'd7cddbd2d595cd5ee2cb9e7e05af8a760f265f84':
  docs: New doc for creating an AfW Work Policy Controller
2015-02-25 13:27:03 +00:00
Andrew Solovay
d6f1fbe04c am 9ac09b6c: am 93df7f07: am 032e931a: am 6ffe1058: am a2ae6c9d: Merge "docs: New "implementing app restrictions" doc" into lmp-docs
* commit '9ac09b6c553060d0104aa8fb3f38f4dfd81a8957':
  docs: New "implementing app restrictions" doc
2015-02-25 13:26:58 +00:00
Chris Craik
7914fa5ce6 am 661b54ae: am 7fc5b5a1: am a9ad0fc7: am f2525ed3: am ea2a0648: Explain behavior of boundless ripple projection
* commit '661b54ae2a55461aa70c07d069550b911c14f800':
  Explain behavior of boundless ripple projection
2015-02-25 13:26:53 +00:00
Joe Fernandez
9afbbb2e60 am 8ffb574a: am f7224396: am c427b721: am 41418826: Merge "docs: Android for Work developer landing page" into lmp-docs
* commit '8ffb574a5087b2099cef5f629568375caa0ddc9c':
  docs: Android for Work developer landing page
2015-02-25 13:16:20 +00:00
Andrew Solovay
d7cddbd2d5 am 7391b0a1: am e64301e6: am 790b1bc8: am d3cd0948: docs: New doc for creating an AfW Work Policy Controller
* commit '7391b0a177f9ecf3c8e3a9657bbf1ae7000ce528':
  docs: New doc for creating an AfW Work Policy Controller
2015-02-25 13:16:15 +00:00
Andrew Solovay
9ac09b6c55 am 93df7f07: am 032e931a: am 6ffe1058: am a2ae6c9d: Merge "docs: New "implementing app restrictions" doc" into lmp-docs
* commit '93df7f0740a6d2044c29227ac6f684c74aa49ff7':
  docs: New "implementing app restrictions" doc
2015-02-25 13:16:11 +00:00
Chris Craik
661b54ae2a am 7fc5b5a1: am a9ad0fc7: am f2525ed3: am ea2a0648: Explain behavior of boundless ripple projection
* commit '7fc5b5a129a3599c4a213117415e113a85d09745':
  Explain behavior of boundless ripple projection
2015-02-25 13:16:06 +00:00
Joe Fernandez
8ffb574a50 am f7224396: am c427b721: am 41418826: Merge "docs: Android for Work developer landing page" into lmp-docs
* commit 'f7224396ee8416630b9387995a79faae1ee68b7c':
  docs: Android for Work developer landing page
2015-02-25 13:09:56 +00:00