Commit Graph

163664 Commits

Author SHA1 Message Date
Rich Slogar
cfb0978fd9 am bc669e3f: am dad1cbeb: am 9f485e97: am 4aba69a8: docs: sdk tools date fix
* commit 'bc669e3f555519f641102b759a04a01ac5c10cad':
  docs: sdk tools date fix
2015-03-05 19:52:05 +00:00
Rich Slogar
bc669e3f55 am dad1cbeb: am 9f485e97: am 4aba69a8: docs: sdk tools date fix
* commit 'dad1cbebfabf421efc90d366d9c4fd67becf930f':
  docs: sdk tools date fix
2015-03-05 19:46:12 +00:00
Rich Slogar
dad1cbebfa am 9f485e97: am 4aba69a8: docs: sdk tools date fix
* commit '9f485e971e06dad399dd70712787f4c30da9515e':
  docs: sdk tools date fix
2015-03-05 19:39:47 +00:00
Rich Slogar
9f485e971e am 4aba69a8: docs: sdk tools date fix
* commit '4aba69a8a7f58541ce76429252dd0c9650b40f35':
  docs: sdk tools date fix
2015-03-05 19:33:56 +00:00
Rich Slogar
4aba69a8a7 docs: sdk tools date fix
Change-Id: Ieb0a5193a5bbf7efd1e5852be4b0db421d08db14
2015-03-05 11:24:45 -08:00
smain@google.com
4f674bbdf8 am 8b2be54a: am 182059f8: am ca10a435: am f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs
* commit '8b2be54a629e4567152d8b0e6c81332632b0b877':
  add tags for wakelock and other API names
2015-03-05 06:18:45 +00:00
smain@google.com
8b2be54a62 am 182059f8: am ca10a435: am f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs
* commit '182059f875bedc778a3ce9710a4f634197d1e959':
  add tags for wakelock and other API names
2015-03-05 06:10:54 +00:00
smain@google.com
182059f875 am ca10a435: am f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs
* commit 'ca10a4352f07652d82da59f6c1630e8607d82dda':
  add tags for wakelock and other API names
2015-03-05 01:12:15 +00:00
smain@google.com
ca10a4352f am f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs
* commit 'f4bbec09a4c3795bc72d6a95aab3488c6c49ce6e':
  add tags for wakelock and other API names
2015-03-05 00:59:24 +00:00
Eric Gilmore
28d11557d6 am 498691d2: am 62777b18: am 5c30adfd: am 22d1c1ce: Merge "Fixing broken link per b/19503824." into lmp-docs
* commit '498691d2641deb1ca30938c7777a9a63882ffd87':
  Fixing broken link per b/19503824.
2015-03-05 00:55:38 +00:00
smain@google.com
f4bbec09a4 Merge "add tags for wakelock and other API names" into lmp-docs 2015-03-05 00:49:49 +00:00
Eric Gilmore
498691d264 am 62777b18: am 5c30adfd: am 22d1c1ce: Merge "Fixing broken link per b/19503824." into lmp-docs
* commit '62777b189dc31c250c4ae06915aae0a337950e1c':
  Fixing broken link per b/19503824.
2015-03-05 00:49:21 +00:00
Bart Sears
0c3052a667 am 4eedcceb: Merge "Merge commit \'83a63bac\' into manualmerge" into lmp-mr1-dev
* commit '4eedccebb7f4c3f9e2f1890f92bead4b9c2a9819':
  Do not make ActivityContainer available to apps. DO NOT MERGE
2015-03-05 00:40:13 +00:00
Bart Sears
4eedccebb7 Merge "Merge commit '83a63bac' into manualmerge" into lmp-mr1-dev 2015-03-05 00:35:08 +00:00
John Spurlock
b879e7395f am c974ac11: MediaProjectionPermissionActivity: Fix NPE.
* commit 'c974ac11f808968648d26e83a0b64a7fba02ad15':
  MediaProjectionPermissionActivity: Fix NPE.
2015-03-04 23:01:26 +00:00
John Spurlock
c974ac11f8 MediaProjectionPermissionActivity: Fix NPE.
Avoid dismissing a null dialog.

Bug: 19492919
Change-Id: I6642bb5194d9818ff3db1266c7c78ed752e23ecf
(cherry picked from commit 3d332f4e67)
2015-03-04 18:58:18 +00:00
Craig Mautner
bbd2ac5adf Merge commit '83a63bac' into manualmerge 2015-03-04 10:10:34 -08:00
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
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