Eric Gilmore
|
5890742da7
|
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:48 +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
|
7ddec30f8c
|
am 4eedcceb: Merge "Merge commit \'83a63bac\' into manualmerge" into lmp-mr1-dev
automerge: 3797ee9
* commit '3797ee96a76225fda7019eb05ca0de0be2efe6c9':
Do not make ActivityContainer available to apps. DO NOT MERGE
|
2015-03-05 00:47:15 +00:00 |
|
Bart Sears
|
3797ee96a7
|
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:06 +00:00 |
|
Bart Sears
|
4eedccebb7
|
Merge "Merge commit '83a63bac' into manualmerge" into lmp-mr1-dev
|
2015-03-05 00:35:08 +00:00 |
|
xinhe
|
6e58424f5b
|
add 2 side RTT support on scan
Bug:19533713
Change-Id: I6b7a32aae1a038eb2941f5564d03a4a0286d5bf3
|
2015-03-04 15:26:49 -08:00 |
|
John Spurlock
|
73cb9679fa
|
am c974ac11: MediaProjectionPermissionActivity: Fix NPE.
automerge: d3c532e
* commit 'd3c532ef254881fc5bfac198651c9032f8108db9':
MediaProjectionPermissionActivity: Fix NPE.
|
2015-03-04 23:10:35 +00:00 |
|
John Spurlock
|
d3c532ef25
|
am c974ac11: MediaProjectionPermissionActivity: Fix NPE.
* commit 'c974ac11f808968648d26e83a0b64a7fba02ad15':
MediaProjectionPermissionActivity: Fix NPE.
|
2015-03-04 23:01:52 +00:00 |
|
John Spurlock
|
c974ac11f8
|
MediaProjectionPermissionActivity: Fix NPE.
Avoid dismissing a null dialog.
Bug: 19492919
Change-Id: I6642bb5194d9818ff3db1266c7c78ed752e23ecf
(cherry picked from commit 3d332f4e67a484abe597576bf329d89655afe720)
|
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 |
|
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
|
2782f31a73
|
am 246a3a4a: am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs
automerge: 9a447bc
* commit '9a447bcc6ef9be7933cd7197a80f51cbc159cf85':
Minor typo fixes in managed profile Javadoc reference pages.
|
2015-03-03 18:10:19 +00:00 |
|
Rich Slogar
|
24446904e0
|
am a81ed3cd: docs: support library updates for sdk 22
automerge: 7a3dc08
* commit '7a3dc08a28ee165fb42c68075f43b01043667940':
docs: support library updates for sdk 22
|
2015-03-03 18:10:12 +00:00 |
|
Rich Slogar
|
c3b576858c
|
am e0ce0f2c: docs: platform revisions 5.1
automerge: 7de9d3b
* commit '7de9d3be0459cc5e9e95157637ff205d8ba1a8ed':
docs: platform revisions 5.1
|
2015-03-03 18:10:05 +00:00 |
|
Joe Fernandez
|
63751cf7d9
|
am 54643332: Merge "Doc change: Add diff report for API 22." into lmp-mr1-dev
automerge: a5587b9
* commit 'a5587b9710f401cb7802d962a3df56e3932b5669':
Doc change: Add diff report for API 22.
|
2015-03-03 18:09:58 +00:00 |
|
Joe Fernandez
|
91572ab150
|
am 2ba57444: Merge "docs: update Android docs build to include API 22, Android 5.1" into lmp-mr1-dev
automerge: 0a1d5ca
* commit '0a1d5ca43378ca8e66d77e43b897d4820cc4f171':
docs: update Android docs build to include API 22, Android 5.1
|
2015-03-03 18:09:51 +00:00 |
|
Rich Slogar
|
0764a8b2a7
|
am 3f3f842c: am d54fe112: am 2cbda290: am 69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-docs
automerge: b068c14
* commit 'b068c14729e8cab0e58fa8261017210a7dcd8289':
docs: sdk tools 24.1 update
|
2015-03-03 18:09:44 +00:00 |
|
Joe Fernandez
|
6e3276c106
|
am 45ef73b4: Merge "docs: Add Android 5.1 to the uses-sdk manifest docs" into lmp-mr1-dev
automerge: 287f257
* commit '287f2571ad213efd5a564df0ae69f432ab9e5c54':
docs: Add Android 5.1 to the uses-sdk manifest docs
|
2015-03-03 18:09:37 +00:00 |
|
Joe Fernandez
|
46d48f97b4
|
am 5c6476aa: Merge "docs: Android 5.1 API Release notes (Lollipop MR1)" into lmp-mr1-dev
automerge: 622c011
* commit '622c0119d6c3bc4bc5d00a940f3a511992b7aae4':
docs: Android 5.1 API Release notes (Lollipop MR1)
|
2015-03-03 18:09:28 +00:00 |
|
Joe Fernandez
|
9a447bcc6e
|
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 17:54:27 +00:00 |
|
Rich Slogar
|
7a3dc08a28
|
am a81ed3cd: docs: support library updates for sdk 22
* commit 'a81ed3cd0f73138832c8386ee66dcbf2b4dce928':
docs: support library updates for sdk 22
|
2015-03-03 17:54:23 +00:00 |
|
Rich Slogar
|
7de9d3be04
|
am e0ce0f2c: docs: platform revisions 5.1
* commit 'e0ce0f2cc28720316902303209f923e699d604f7':
docs: platform revisions 5.1
|
2015-03-03 17:54:18 +00:00 |
|
Joe Fernandez
|
a5587b9710
|
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 17:54:14 +00:00 |
|
Joe Fernandez
|
0a1d5ca433
|
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 17:54:10 +00:00 |
|
Rich Slogar
|
b068c14729
|
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 17:54:06 +00:00 |
|
Joe Fernandez
|
287f2571ad
|
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 17:54:02 +00:00 |
|
Joe Fernandez
|
622c0119d6
|
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 17:53:58 +00:00 |
|
Paul Jensen
|
44f72397be
|
Correct "Sign-in" and "Sign into" to "Sign in to".
bug:19416574
Change-Id: I55cedd2a3e1c1c3192ece860f37c82a55cb6d7c0
|
2015-03-03 15:46:36 +00:00 |
|
Erik Kline
|
46bdfa90c9
|
Merge "Refactor NetworkUtils interaction with DHCP." into m-wireless-dev
|
2015-03-03 06:34:07 +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 |
|
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 |
|
Shishir Agrawal
|
335b59f847
|
am bcced5b8: Merge "Fix incorrect condition for sub id check." into lmp-mr1-dev
automerge: 4322c8d
* commit '4322c8d54ef935a3224c8fcbf7ab55ac48f34f1b':
Fix incorrect condition for sub id check.
|
2015-03-03 03:11:47 +00:00 |
|
Rich Slogar
|
e0ce0f2cc2
|
docs: platform revisions 5.1
Change-Id: Iabbd8617e3d334228fec94254160f2e43cdd22c6
|
2015-03-02 18:55:44 -08:00 |
|
Shishir Agrawal
|
4322c8d54e
|
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-03 02:54:12 +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
|
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
|
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 |
|