163851 Commits

Author SHA1 Message Date
Eric Gilmore
62777b189d am 5c30adfd: am 22d1c1ce: Merge "Fixing broken link per b/19503824." into lmp-docs
* commit '5c30adfdb6ef4b004ef0b88006660598f40eb6f5':
  Fixing broken link per b/19503824.
2015-03-04 17:53:31 +00:00
Eric Gilmore
5c30adfdb6 am 22d1c1ce: Merge "Fixing broken link per b/19503824." into lmp-docs
* commit '22d1c1ce1dc3c84d7517ba64a5d07b5946e49514':
  Fixing broken link per b/19503824.
2015-03-04 17:47:01 +00:00
Eric Gilmore
22d1c1ce1d Merge "Fixing broken link per b/19503824." into lmp-docs 2015-03-04 17:40:16 +00:00
Craig Mautner
83a63bac5d am 8fa394fa: Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-dev
* commit '8fa394fa8c4eb3ca832dac36baf5645a40d449f1':
  Do not make ActivityContainer available to apps. DO NOT MERGE
2015-03-04 16:15:35 +00:00
Craig Mautner
8fa394fa8c Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-dev 2015-03-04 16:09:29 +00:00
Geoff Mendal
3b9e64f326 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2015-03-04 14:04:04 +00:00
Geoff Mendal
c70510298e Import translations. DO NOT MERGE
Change-Id: I50787822a2df02ff61bfe4f7402b96dcd2cd43a7
Auto-generated-cl: translation import
2015-03-04 06:02:36 -08:00
Geoff Mendal
63069cc985 Import translations. DO NOT MERGE
Change-Id: If2c19af2e0b45fec9a0486eedbe51d7fe8bdf426
Auto-generated-cl: translation import
2015-03-04 05:56:33 -08:00
Dan Sandler
e163a645dd Avoid crashing on startup when policy forbids lockscreen camera.
Bug: 19554426
Change-Id: I5b2898d7d114de87d925b5eccc8e4b189e4713de
2015-03-03 16:06:28 -05:00
Luan Nguyen
83026cf0ec docs: Add new partners to Wear index page
bug: 19550254
Change-Id: If5f4722ff480e965cce998bd6383d3a2df0cfe0d
2015-03-03 13:06:03 -08:00
Eric Gilmore
00eefca280 Fixing broken link per b/19503824.
Change-Id: I4140decb254cf9c9f0eadfce1a3897c240d640d9
2015-03-03 12:10:19 -08:00
Joe Fernandez
1137ca03be am 246a3a4a: am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs
* commit '246a3a4a797edf5850073ec8f6b8aa997947d09b':
  Minor typo fixes in managed profile Javadoc reference pages.
2015-03-03 06:36:02 +00:00
Joe Fernandez
246a3a4a79 am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs
* commit '14fcef3bf02f46a057676d7a6d755daee735c4ea':
  Minor typo fixes in managed profile Javadoc reference pages.
2015-03-03 06:29:33 +00:00
Joe Fernandez
14fcef3bf0 am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs
* commit 'c4418980a083c1cd26b789297f084e03036b5fdd':
  Minor typo fixes in managed profile Javadoc reference pages.
2015-03-03 06:22:42 +00:00
Joe Fernandez
c4418980a0 am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs
* commit 'a31378dc49868412a2e632bcc46a44877a9b397f':
  Minor typo fixes in managed profile Javadoc reference pages.
2015-03-03 06:15:29 +00:00
Rich Slogar
646c7cd6e8 am a81ed3cd: docs: support library updates for sdk 22
* commit 'a81ed3cd0f73138832c8386ee66dcbf2b4dce928':
  docs: support library updates for sdk 22
2015-03-03 06:13:41 +00:00
Joe Fernandez
a31378dc49 Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs 2015-03-03 06:11:50 +00:00
Rich Slogar
a81ed3cd0f docs: support library updates for sdk 22
Change-Id: I4cb14e6c941652fe02d98ffac32451eea6f4576c
2015-03-02 22:07:07 -08:00
Rich Slogar
ad334de54a am e0ce0f2c: docs: platform revisions 5.1
* commit 'e0ce0f2cc28720316902303209f923e699d604f7':
  docs: platform revisions 5.1
2015-03-03 03:06:48 +00:00
Rich Slogar
e0ce0f2cc2 docs: platform revisions 5.1
Change-Id: Iabbd8617e3d334228fec94254160f2e43cdd22c6
2015-03-02 18:55:44 -08:00
Joe Fernandez
8fe980e803 am 54643332: Merge "Doc change: Add diff report for API 22." into lmp-mr1-dev
* commit '546433328d0b017419bd3d5ff6ee5708645455db':
  Doc change: Add diff report for API 22.
2015-03-03 02:07:29 +00:00
Joe Fernandez
546433328d Merge "Doc change: Add diff report for API 22." into lmp-mr1-dev 2015-03-03 02:03:45 +00:00
Joe Fernandez
a2bbdb9630 am 2ba57444: Merge "docs: update Android docs build to include API 22, Android 5.1" into lmp-mr1-dev
* commit '2ba57444e8368ab66ae43fe2304e39dc76fc64ff':
  docs: update Android docs build to include API 22, Android 5.1
2015-03-03 01:47:26 +00:00
Joe Fernandez
2ba57444e8 Merge "docs: update Android docs build to include API 22, Android 5.1" into lmp-mr1-dev 2015-03-03 01:42:41 +00:00
Rich Slogar
9b4a363d0d am 3f3f842c: am d54fe112: am 2cbda290: am 69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-docs
* commit '3f3f842cc06e0103041e7dae4c3f9fbf1f7ab9c0':
  docs: sdk tools 24.1 update
2015-03-03 01:34:25 +00:00
Rich Slogar
3f3f842cc0 am d54fe112: am 2cbda290: am 69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-docs
* commit 'd54fe112a24ec3a692d35a4ccf1f73fa5caaaf5e':
  docs: sdk tools 24.1 update
2015-03-03 01:27:07 +00:00
Andrew Solovay
27f5337841 Minor typo fixes in managed profile Javadoc reference pages.
See first comment for stage location.

bug: 19389235
Change-Id: I2e1d5169a77e3f4000e73f08d493953ce4eee78c
2015-03-02 17:22:18 -08:00
Rich Slogar
d54fe112a2 am 2cbda290: am 69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-docs
* commit '2cbda290f66b5a17d3542ada26f7e91b3893f72d':
  docs: sdk tools 24.1 update
2015-03-03 01:20:33 +00:00
Joe Fernandez
be34916d44 am 45ef73b4: Merge "docs: Add Android 5.1 to the uses-sdk manifest docs" into lmp-mr1-dev
* commit '45ef73b4e97a0621ba5f26eef280f6550c81338d':
  docs: Add Android 5.1 to the uses-sdk manifest docs
2015-03-03 01:15:31 +00:00
Rich Slogar
2cbda290f6 am 69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-docs
* commit '69b58e74e087159ed5950632b4ab3738a841c633':
  docs: sdk tools 24.1 update
2015-03-03 01:13:36 +00:00
Rich Slogar
69b58e74e0 Merge "docs: sdk tools 24.1 update" into lmp-docs 2015-03-03 01:07:44 +00:00
Joe Fernandez
46c588b939 am 5c6476aa: Merge "docs: Android 5.1 API Release notes (Lollipop MR1)" into lmp-mr1-dev
* commit '5c6476aa507577422557d8434a7ce19937cfccfd':
  docs: Android 5.1 API Release notes (Lollipop MR1)
2015-03-03 01:06:10 +00:00
Joe Fernandez
45ef73b4e9 Merge "docs: Add Android 5.1 to the uses-sdk manifest docs" into lmp-mr1-dev 2015-03-03 01:02:55 +00:00
Joe Fernandez
5c6476aa50 Merge "docs: Android 5.1 API Release notes (Lollipop MR1)" into lmp-mr1-dev 2015-03-03 00:56:43 +00:00
Joe Fernandez
2c25106ab4 docs: Add Android 5.1 to the uses-sdk manifest docs
Change-Id: Idf9962af4250e68ed885571a57b9a51a40f74267
2015-03-02 16:43:14 -08:00
Joe Fernandez
3d44c0faca docs: update Android docs build to include API 22, Android 5.1
Change-Id: If41c1a142db0f2df439afaa9cf5d0fe0ca47d2c0
2015-03-02 15:53:38 -08:00
Joe Fernandez
50d0953a86 docs: Android 5.1 API Release notes (Lollipop MR1)
Change-Id: I47f59ade26086b8368d8b395f92992edc27510d0
2015-03-02 15:35:07 -08:00
Shishir Agrawal
20a5df6205 am bcced5b8: Merge "Fix incorrect condition for sub id check." into lmp-mr1-dev
* commit 'bcced5b834e49bf3a0b57a0009958ba061d31e76':
  Fix incorrect condition for sub id check.
2015-03-02 22:38:43 +00:00
Shishir Agrawal
bcced5b834 Merge "Fix incorrect condition for sub id check." into lmp-mr1-dev 2015-03-02 22:32:17 +00:00
Luan Nguyen
f46471e304 docs: Remove deprecated Fitness information from this doc.
Guides have been moved to developers.google.com/fit

bug: 19387145
Change-Id: I6d14d2e643e68d923e135555e0b3c78060e22b8e
2015-03-02 14:26:47 -08:00
Deepanshu Gupta
32dc37b72e am f2c1c096: am 6ed9b75a: am 72d75f8d: Merge "Correct PorterDuff filters." into lmp-dev
* commit 'f2c1c09683a5cfa23e8394fe5a10e84803f4168b':
  Correct PorterDuff filters.
2015-03-02 19:56:27 +00:00
Deepanshu Gupta
4e87709b8b am 2022b0ff: am d003e813: am 369ad57b: Merge "Fix codestyle for switch statements." into lmp-dev
* commit '2022b0ffdd7c91e8435bc204ad9aedd658254166':
  Fix codestyle for switch statements.
2015-03-02 19:56:24 +00:00
Deepanshu Gupta
6250030736 am aff0ec93: am 81449b2c: am 10d620ff: Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev
* commit 'aff0ec93f2a734a68673f1f7337533b6d93cb256':
  Better error msg for StateList/Hexadecimal Color.
2015-03-02 19:56:18 +00:00
Deepanshu Gupta
f2c1c09683 am 6ed9b75a: am 72d75f8d: Merge "Correct PorterDuff filters." into lmp-dev
* commit '6ed9b75a45ec4bc62b4a0fac2c86479d61918863':
  Correct PorterDuff filters.
2015-03-02 19:52:33 +00:00
Deepanshu Gupta
2022b0ffdd am d003e813: am 369ad57b: Merge "Fix codestyle for switch statements." into lmp-dev
* commit 'd003e8133167f2b6741f8eb925fdc9f77c2800a5':
  Fix codestyle for switch statements.
2015-03-02 19:52:29 +00:00
Deepanshu Gupta
aff0ec93f2 am 81449b2c: am 10d620ff: Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev
* commit '81449b2c4a63392bff22d77f331f4db52011884b':
  Better error msg for StateList/Hexadecimal Color.
2015-03-02 19:52:25 +00:00
Deepanshu Gupta
6ed9b75a45 am 72d75f8d: Merge "Correct PorterDuff filters." into lmp-dev
* commit '72d75f8d9fb46c04f0458e1f36b064e2b8c3de71':
  Correct PorterDuff filters.
2015-03-02 19:44:51 +00:00
Deepanshu Gupta
d003e81331 am 369ad57b: Merge "Fix codestyle for switch statements." into lmp-dev
* commit '369ad57b00f1c94c80f0f80ef2e7063a23a94a84':
  Fix codestyle for switch statements.
2015-03-02 19:44:47 +00:00
Deepanshu Gupta
81449b2c4a am 10d620ff: Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev
* commit '10d620ff2c4770e926b693e833105e8dbbd5fa86':
  Better error msg for StateList/Hexadecimal Color.
2015-03-02 19:44:43 +00:00
Deepanshu Gupta
7b4caab1a8 am 07d453fa: Merge "Add status bar time for 5.1" into lmp-mr1-dev
* commit '07d453fa091ab407864d474f9bf2a5167686010a':
  Add status bar time for 5.1
2015-03-02 19:41:59 +00:00