174796 Commits

Author SHA1 Message Date
Rich Slogar
747e4da618 am fa514d69: am 5b3b1a17: am bd409177: am 1836eea0: am 41104632: am eedf6ad8: Merge "docs: remove exploring sdk link" into lmp-docs
* commit 'fa514d6907db6c96ac662b6e06897bcc020c6a43':
  docs: remove exploring sdk link
2015-02-25 23:52:56 +00:00
Rich Slogar
fdbda56a2d am 1e72a9b2: am 2ed2c141: am 81049aff: am f8a95b0b: am 84994e87: am db2ebca7: Merge "docs: note to install linux packages v2 update" into lmp-docs
* commit '1e72a9b2477bb350cb7922ad4f166eba62b0bbdd':
  docs: note to install linux packages v2 update
2015-02-25 23:52:50 +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
Dan Albert
72e7217d0b am b7121d70: am b78cce6f: Merge "Update autogenerated gl functions."
* commit 'b7121d703067b440281f27a40b8273b17bef1e62':
  Update autogenerated gl functions.
2015-02-25 23:07:47 +00:00
Dan Albert
b7121d7030 am b78cce6f: Merge "Update autogenerated gl functions."
* commit 'b78cce6f92e38b57a6a56183cdbafc054c5758fe':
  Update autogenerated gl functions.
2015-02-25 23:00:52 +00:00
Dan Albert
b78cce6f92 Merge "Update autogenerated gl functions." 2015-02-25 22:50:25 +00:00
Filip Gruszczynski
0fbcc7086f am 1e74b5d6: Merge "Burn in protection." into lmp-mr1-modular-dev
* commit '1e74b5d6b0e964b7a9e58e64b45f50aec15b1178':
  Burn in protection.
2015-02-25 21:40:38 +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
892609ad34 am aeffc9ce: Merge "Always draw the circular emulator overlay with square dimensions" into lmp-mr1-modular-dev
* commit 'aeffc9cebd4e97889f5b2f61de38c60b83535ffa':
  Always draw the circular emulator overlay with square dimensions
2015-02-25 19:47:12 +00: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
Mark Salyzyn
f7b6804952 am 533758c1: am 0d8b97a4: Merge "jni: switch to ANDROID_LOG_* mode flags"
* commit '533758c1fb2dcf5b50db46b60d26ecae72fc71ee':
  jni: switch to ANDROID_LOG_* mode flags
2015-02-25 19:19:27 +00:00
Mark Salyzyn
533758c1fb am 0d8b97a4: Merge "jni: switch to ANDROID_LOG_* mode flags"
* commit '0d8b97a44e4cb5c5cfffd6421eb2cec1ebc00d2f':
  jni: switch to ANDROID_LOG_* mode flags
2015-02-25 19:13:12 +00:00
Mark Salyzyn
0d8b97a44e Merge "jni: switch to ANDROID_LOG_* mode flags" 2015-02-25 19:04:24 +00:00
Filip Gruszczynski
cf8c112ed8 am 01dd0e86: Merge "Force translucency from windowIsTranslucent on SwipeDismissLayout." into lmp-mr1-modular-dev
* commit '01dd0e86546a5bf815dd9a6e7cd4b7bf8e8f5719':
  Force translucency from windowIsTranslucent on SwipeDismissLayout.
2015-02-25 18:44:57 +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
b060f018ef am 91aa1bdb: am 19847b07: am b46e4806: Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev
* commit '91aa1bdb57a82b59401afd88aaeb429ea4c73bac':
  Remove TrustAgent whitelisting API
2015-02-25 18:23: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
Mark Salyzyn
18998c9852 jni: switch to ANDROID_LOG_* mode flags
Change-Id: I8aea5bf4faf79a96fa8485f7707e7484cd11d7a3
2015-02-25 18:07:21 +00:00
Jim Miller
b46e48067f Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev 2015-02-25 18:04:58 +00:00
Geoff Mendal
c88604bcb9 am 6715b9dd: (-s ours) am bb463806: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '6715b9dda1ada0a71ddc8215bc9c050c76fb309d':
  Import translations. DO NOT MERGE
2015-02-25 17:12:34 +00:00
Geoff Mendal
d170ff32c0 am 28e4a357: (-s ours) am c2cbbb89: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '28e4a357ce341ccb535352708f241a098f22bbf5':
  Import translations. DO NOT MERGE
2015-02-25 17:12:28 +00:00
Geoff Mendal
ed6db520b8 am 6d471d04: (-s ours) am a4f54454: (-s ours) Import translations. DO NOT MERGE
* commit '6d471d04b086d6d21b2e01f2368ec02af36d9970':
  Import translations. DO NOT MERGE
2015-02-25 17:12:23 +00:00
Geoff Mendal
336beed4d1 am aee4a86a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit 'aee4a86a049c8c427a5b5f2d0d8ab0e6be520f00':
  Import translations. DO NOT MERGE
2015-02-25 17:12:00 +00:00
Geoff Mendal
9d695da885 am ce64b99e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit 'ce64b99e4478f047ff871078e2ad64d4c4818529':
  Import translations. DO NOT MERGE
2015-02-25 17:11:54 +00:00
Geoff Mendal
dd535604fc am 53ddd69e: (-s ours) Import translations. DO NOT MERGE
* commit '53ddd69ea737a20541735bce28b950feeab2d0a8':
  Import translations. DO NOT MERGE
2015-02-25 17:11:49 +00:00
Joe Fernandez
20928caef4 am 4e3e6fb1: am 9afbbb2e: am 8ffb574a: am f7224396: am c427b721: am 41418826: Merge "docs: Android for Work developer landing page" into lmp-docs
* commit '4e3e6fb16e091815bee4a0be657f462a9f0e4229':
  docs: Android for Work developer landing page
2015-02-25 17:11:17 +00:00
Andrew Solovay
3999d0fdd7 am 2557fb07: am d7cddbd2: am 7391b0a1: am e64301e6: am 790b1bc8: am d3cd0948: docs: New doc for creating an AfW Work Policy Controller
* commit '2557fb070a54a65277c320f20cedde828febb1e2':
  docs: New doc for creating an AfW Work Policy Controller
2015-02-25 17:11:11 +00:00
Andrew Solovay
79d543eb26 am d6f1fbe0: am 9ac09b6c: am 93df7f07: am 032e931a: am 6ffe1058: am a2ae6c9d: Merge "docs: New "implementing app restrictions" doc" into lmp-docs
* commit 'd6f1fbe04cd7e099c1fa95967c1b7ddfad8669d3':
  docs: New "implementing app restrictions" doc
2015-02-25 17:11:05 +00:00
Chris Craik
40d8cd6ffa am 7914fa5c: am 661b54ae: am 7fc5b5a1: am a9ad0fc7: am f2525ed3: am ea2a0648: Explain behavior of boundless ripple projection
* commit '7914fa5ce6c521d4aa7b16a37a2f2df9263b123b':
  Explain behavior of boundless ripple projection
2015-02-25 17:10:59 +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