OSDN Git Service
Geoff Mendal [Mon, 9 Mar 2015 15:45:18 +0000 (15:45 +0000)]
am
d7852b66: (-s ours) Import translations. DO NOT MERGE
* commit '
d7852b66abfecf2de4422f92a8ebc5681082ecaf':
Import translations. DO NOT MERGE
Eric Gilmore [Mon, 9 Mar 2015 15:45:03 +0000 (15:45 +0000)]
am
f1eab6f5: am
39d47c7c: am
a2d342e3: am
beed9332: am
0bceaacf: Merge "Reworking geofencing training to new API and sample." into lmp-docs
* commit '
f1eab6f5d82e669b654d185b88ba94b4cff3689c':
Reworking geofencing training to new API and sample.
Glenn Kasten [Mon, 9 Mar 2015 15:44:52 +0000 (15:44 +0000)]
Geoff Mendal [Mon, 9 Mar 2015 12:56:54 +0000 (05:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5057e9ae3a255e9315967eae49f71c862fd53290
Auto-generated-cl: translation import
Geoff Mendal [Mon, 9 Mar 2015 12:34:56 +0000 (05:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9679db5505c907b78d3d97585d061f6746b0af7f
Auto-generated-cl: translation import
Bryce Lee [Fri, 6 Mar 2015 23:21:46 +0000 (15:21 -0800)]
Allow the keyguard service to be configurable.
Change-Id: I811171c228764c3e0e507ad3ce28835ccad9bb31
Bryce Lee [Fri, 6 Mar 2015 20:41:12 +0000 (20:41 +0000)]
Merge "Allow press and hold from non-interactive." into lmp-mr1-modular-dev
Eric Gilmore [Fri, 6 Mar 2015 19:39:52 +0000 (19:39 +0000)]
am
39d47c7c: am
a2d342e3: am
beed9332: am
0bceaacf: Merge "Reworking geofencing training to new API and sample." into lmp-docs
* commit '
39d47c7c709cd2417f8a0a7849ed6da8eb83caa3':
Reworking geofencing training to new API and sample.
Eric Gilmore [Fri, 6 Mar 2015 19:33:51 +0000 (19:33 +0000)]
am
a2d342e3: am
beed9332: am
0bceaacf: Merge "Reworking geofencing training to new API and sample." into lmp-docs
* commit '
a2d342e374b6c3152695ad0761a2bdb96be2d8c4':
Reworking geofencing training to new API and sample.
Eric Gilmore [Fri, 6 Mar 2015 19:27:14 +0000 (19:27 +0000)]
am
beed9332: am
0bceaacf: Merge "Reworking geofencing training to new API and sample." into lmp-docs
* commit '
beed93320633a0c460952eaa91a61a1d186e390a':
Reworking geofencing training to new API and sample.
Eric Gilmore [Fri, 6 Mar 2015 19:20:45 +0000 (19:20 +0000)]
am
0bceaacf: Merge "Reworking geofencing training to new API and sample." into lmp-docs
* commit '
0bceaacf4221a5b302d12fc085744bb54cbbdd6e':
Reworking geofencing training to new API and sample.
Eric Gilmore [Fri, 6 Mar 2015 19:14:27 +0000 (19:14 +0000)]
Merge "Reworking geofencing training to new API and sample." into lmp-docs
Eric Gilmore [Fri, 30 Jan 2015 00:21:43 +0000 (16:21 -0800)]
Reworking geofencing training to new API and sample.
Change-Id: Ibc9e2561cd93e73eab87a78f4aabe64ae9c8a0b3
Glenn Kasten [Fri, 6 Mar 2015 16:45:31 +0000 (16:45 +0000)]
Glenn Kasten [Fri, 6 Mar 2015 16:38:48 +0000 (16:38 +0000)]
Glenn Kasten [Fri, 6 Mar 2015 16:32:39 +0000 (16:32 +0000)]
Glenn Kasten [Fri, 6 Mar 2015 16:25:58 +0000 (16:25 +0000)]
Glenn Kasten [Thu, 31 Jul 2014 18:11:11 +0000 (11:11 -0700)]
Fix USB typos
Change-Id: Iefa610a81e9155dcfc687c514611bb7dbba5d7f9
(cherry picked from commit
9e86f6139b62dbc87b7ea97cedf847c847657829)
Dan Sandler [Fri, 6 Mar 2015 00:21:47 +0000 (00:21 +0000)]
am
e6a4b445: am
3581f4c9: Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev
* commit '
e6a4b445944489d67d40c8f52322fb149290fcf8':
Avoid crashing on startup when policy forbids lockscreen camera.
Dan Sandler [Fri, 6 Mar 2015 00:10:22 +0000 (00:10 +0000)]
am
3581f4c9: Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev
* commit '
3581f4c91a77ecb9313f51a2d07ed88ff61d9299':
Avoid crashing on startup when policy forbids lockscreen camera.
Dan Sandler [Fri, 6 Mar 2015 00:03:34 +0000 (00:03 +0000)]
Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev
Eric Gilmore [Thu, 5 Mar 2015 23:26:17 +0000 (23:26 +0000)]
am
685e6ce8: am
636a39ba: am
e95fa264: am
e17b0a14: am
87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs
* commit '
685e6ce830f97383846335eec758e83ba3ad7060':
Re-fixing link, and removing trailing white space.
Eric Gilmore [Thu, 5 Mar 2015 23:11:09 +0000 (23:11 +0000)]
am
636a39ba: am
e95fa264: am
e17b0a14: am
87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs
* commit '
636a39babbda97743b33511b3dd2addafc8c2847':
Re-fixing link, and removing trailing white space.
Eric Gilmore [Thu, 5 Mar 2015 23:04:27 +0000 (23:04 +0000)]
am
e95fa264: am
e17b0a14: am
87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs
* commit '
e95fa2649b62a3fbccd096b43925a17c6ff03228':
Re-fixing link, and removing trailing white space.
Eric Gilmore [Thu, 5 Mar 2015 22:50:16 +0000 (22:50 +0000)]
am
e17b0a14: am
87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs
* commit '
e17b0a14ccc427bff386517537fcf23e00a087d4':
Re-fixing link, and removing trailing white space.
Eric Gilmore [Thu, 5 Mar 2015 22:34:58 +0000 (22:34 +0000)]
am
87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs
* commit '
87499b275bc7a8d4a12a3134646769a5c6c34829':
Re-fixing link, and removing trailing white space.
Eric Gilmore [Thu, 5 Mar 2015 22:00:20 +0000 (22:00 +0000)]
Merge "Re-fixing link, and removing trailing white space." into lmp-docs
Eric Gilmore [Thu, 5 Mar 2015 21:39:21 +0000 (13:39 -0800)]
Re-fixing link, and removing trailing white space.
Change-Id: Ic6cef9862424d5581cf0ad5b8366c7033a9fdd93
Rich Slogar [Thu, 5 Mar 2015 19:59:55 +0000 (19:59 +0000)]
am
cfb0978f: am
bc669e3f: am
dad1cbeb: am
9f485e97: am
4aba69a8: docs: sdk tools date fix
* commit '
cfb0978fd9a6bf8fa06dee061df03fccf20fabc4':
docs: sdk tools date fix
Rich Slogar [Thu, 5 Mar 2015 19:52:05 +0000 (19:52 +0000)]
am
bc669e3f: am
dad1cbeb: am
9f485e97: am
4aba69a8: docs: sdk tools date fix
* commit '
bc669e3f555519f641102b759a04a01ac5c10cad':
docs: sdk tools date fix
Rich Slogar [Thu, 5 Mar 2015 19:46:12 +0000 (19:46 +0000)]
am
dad1cbeb: am
9f485e97: am
4aba69a8: docs: sdk tools date fix
* commit '
dad1cbebfabf421efc90d366d9c4fd67becf930f':
docs: sdk tools date fix
Rich Slogar [Thu, 5 Mar 2015 19:39:47 +0000 (19:39 +0000)]
am
9f485e97: am
4aba69a8: docs: sdk tools date fix
* commit '
9f485e971e06dad399dd70712787f4c30da9515e':
docs: sdk tools date fix
Rich Slogar [Thu, 5 Mar 2015 19:33:56 +0000 (19:33 +0000)]
am
4aba69a8: docs: sdk tools date fix
* commit '
4aba69a8a7f58541ce76429252dd0c9650b40f35':
docs: sdk tools date fix
Rich Slogar [Thu, 5 Mar 2015 19:24:45 +0000 (11:24 -0800)]
docs: sdk tools date fix
Change-Id: Ieb0a5193a5bbf7efd1e5852be4b0db421d08db14
smain@google.com [Thu, 5 Mar 2015 06:25:43 +0000 (06:25 +0000)]
am
4f674bbd: am
8b2be54a: am
182059f8: am
ca10a435: am
f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs
* commit '
4f674bbdf83056141f3dccf1af8af3113e17af87':
add tags for wakelock and other API names
smain@google.com [Thu, 5 Mar 2015 06:18:45 +0000 (06:18 +0000)]
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
smain@google.com [Thu, 5 Mar 2015 06:10:54 +0000 (06:10 +0000)]
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
Anthony Hugh [Thu, 5 Mar 2015 04:04:04 +0000 (04:04 +0000)]
Merge "Update "Optimizing app X from Y string"" into lmp-mr1-modular-dev
smain@google.com [Thu, 5 Mar 2015 01:12:15 +0000 (01:12 +0000)]
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
Eric Gilmore [Thu, 5 Mar 2015 01:02:55 +0000 (01:02 +0000)]
am
28d11557: am
498691d2: am
62777b18: am
5c30adfd: am
22d1c1ce: Merge "Fixing broken link per b/
19503824." into lmp-docs
* commit '
28d11557d6846e7ea7fb2593a6ed4d3a16f5eef6':
Fixing broken link per b/
19503824.
smain@google.com [Thu, 5 Mar 2015 00:59:24 +0000 (00:59 +0000)]
am
f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs
* commit '
f4bbec09a4c3795bc72d6a95aab3488c6c49ce6e':
add tags for wakelock and other API names
Eric Gilmore [Thu, 5 Mar 2015 00:55:38 +0000 (00:55 +0000)]
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.
Bart Sears [Thu, 5 Mar 2015 00:52:58 +0000 (00:52 +0000)]
am
0c3052a6: am
4eedcceb: Merge "Merge commit \'
83a63bac\' into manualmerge" into lmp-mr1-dev
* commit '
0c3052a6675ed528c2898bd2ecb92576bca78df9':
Do not make ActivityContainer available to apps. DO NOT MERGE
smain@google.com [Thu, 5 Mar 2015 00:49:48 +0000 (00:49 +0000)]
Merge "add tags for wakelock and other API names" into lmp-docs
Eric Gilmore [Thu, 5 Mar 2015 00:49:21 +0000 (00:49 +0000)]
am
62777b18: am
5c30adfd: am
22d1c1ce: Merge "Fixing broken link per b/
19503824." into lmp-docs
* commit '
62777b189dc31c250c4ae06915aae0a337950e1c':
Fixing broken link per b/
19503824.
Bart Sears [Thu, 5 Mar 2015 00:40:13 +0000 (00:40 +0000)]
am
4eedcceb: Merge "Merge commit \'
83a63bac\' into manualmerge" into lmp-mr1-dev
* commit '
4eedccebb7f4c3f9e2f1890f92bead4b9c2a9819':
Do not make ActivityContainer available to apps. DO NOT MERGE
Bart Sears [Thu, 5 Mar 2015 00:35:07 +0000 (00:35 +0000)]
Merge "Merge commit '
83a63bac' into manualmerge" into lmp-mr1-dev
Tucker Sylvestro [Thu, 5 Mar 2015 00:15:06 +0000 (00:15 +0000)]
Merge "DO NOT MERGE ANYWHERE Bluetooth native dumpsys logging support (3/4)" into lmp-mr1-modular-dev
Anthony Hugh [Wed, 4 Mar 2015 00:50:05 +0000 (16:50 -0800)]
Update "Optimizing app X from Y string"
The word "Optimizing" is rendering on two lines on Lenok due to being too
long. New design is to shorten the string on watches to avoid this issue.
BUG:
18388692
BUG:
18902013
BUG:
16493311
Change-Id: I8d9a9e8fcade460e50f9bf71d5cb0c6e415f871e
John Spurlock [Wed, 4 Mar 2015 23:09:19 +0000 (23:09 +0000)]
am
b879e739: am
c974ac11: MediaProjectionPermissionActivity: Fix NPE.
* commit '
b879e7395fa9446952b840b1d576ff225b039774':
MediaProjectionPermissionActivity: Fix NPE.
John Spurlock [Wed, 4 Mar 2015 23:01:26 +0000 (23:01 +0000)]
am
c974ac11: MediaProjectionPermissionActivity: Fix NPE.
* commit '
c974ac11f808968648d26e83a0b64a7fba02ad15':
MediaProjectionPermissionActivity: Fix NPE.
Andre Eisenbach [Fri, 5 Dec 2014 17:31:30 +0000 (09:31 -0800)]
DO NOT MERGE ANYWHERE Bluetooth native dumpsys logging support (3/4)
Bug:
18508263
Change-Id: I88f9c90dab8b0c825010c8617709449a3dd704b2
John Spurlock [Tue, 24 Feb 2015 17:14:06 +0000 (12:14 -0500)]
MediaProjectionPermissionActivity: Fix NPE.
Avoid dismissing a null dialog.
Bug:
19492919
Change-Id: I6642bb5194d9818ff3db1266c7c78ed752e23ecf
(cherry picked from commit
3d332f4e67a484abe597576bf329d89655afe720)
Craig Mautner [Wed, 4 Mar 2015 18:10:34 +0000 (10:10 -0800)]
Merge commit '
83a63bac' into manualmerge
Eric Gilmore [Wed, 4 Mar 2015 17:53:31 +0000 (17:53 +0000)]
am
5c30adfd: am
22d1c1ce: Merge "Fixing broken link per b/
19503824." into lmp-docs
* commit '
5c30adfdb6ef4b004ef0b88006660598f40eb6f5':
Fixing broken link per b/
19503824.
Eric Gilmore [Wed, 4 Mar 2015 17:47:01 +0000 (17:47 +0000)]
am
22d1c1ce: Merge "Fixing broken link per b/
19503824." into lmp-docs
* commit '
22d1c1ce1dc3c84d7517ba64a5d07b5946e49514':
Fixing broken link per b/
19503824.
Eric Gilmore [Wed, 4 Mar 2015 17:40:15 +0000 (17:40 +0000)]
Merge "Fixing broken link per b/
19503824." into lmp-docs
Craig Mautner [Wed, 4 Mar 2015 16:15:35 +0000 (16:15 +0000)]
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
Craig Mautner [Wed, 4 Mar 2015 16:09:28 +0000 (16:09 +0000)]
Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-dev
Geoff Mendal [Wed, 4 Mar 2015 14:08:11 +0000 (14:08 +0000)]
am
3b9e64f3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
3b9e64f3265ad146da1b9f5b523c406acd041f59':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Mar 2015 14:08:03 +0000 (14:08 +0000)]
am
63069cc9: (-s ours) Import translations. DO NOT MERGE
* commit '
63069cc985869fe06254e352ea63b361cb0d0917':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Mar 2015 14:04:03 +0000 (14:04 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Wed, 4 Mar 2015 14:02:36 +0000 (06:02 -0800)]
Import translations. DO NOT MERGE
Change-Id: I50787822a2df02ff61bfe4f7402b96dcd2cd43a7
Auto-generated-cl: translation import
Geoff Mendal [Wed, 4 Mar 2015 13:56:33 +0000 (05:56 -0800)]
Import translations. DO NOT MERGE
Change-Id: If2c19af2e0b45fec9a0486eedbe51d7fe8bdf426
Auto-generated-cl: translation import
Geoff Mendal [Wed, 4 Mar 2015 13:42:01 +0000 (13:42 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
Geoff Mendal [Wed, 4 Mar 2015 13:41:21 +0000 (13:41 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
Geoff Mendal [Wed, 4 Mar 2015 13:36:32 +0000 (07:36 -0600)]
Import translations. DO NOT MERGE
Change-Id: Ibbd6d3677d2e146de85bfc7130371546b31cb404
Auto-generated-cl: translation import
Geoff Mendal [Wed, 4 Mar 2015 13:35:11 +0000 (05:35 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ifb9b4ef49d9e590dc0e37eb3f91b5ae6ad0ba693
Auto-generated-cl: translation import
Geoff Mendal [Wed, 4 Mar 2015 13:29:01 +0000 (05:29 -0800)]
Import translations. DO NOT MERGE
Change-Id: I253641b732a51a58cbabaa6b487e37f5eda69e2b
Auto-generated-cl: translation import
Dan Sandler [Mon, 2 Mar 2015 03:58:32 +0000 (22:58 -0500)]
Avoid crashing on startup when policy forbids lockscreen camera.
Bug:
19554426
Change-Id: I5b2898d7d114de87d925b5eccc8e4b189e4713de
Craig Mautner [Tue, 3 Mar 2015 21:03:28 +0000 (21:03 +0000)]
Merge "Change ActivityView startActivity state sequence" into lmp-mr1-modular-dev
Eric Gilmore [Tue, 3 Mar 2015 20:10:19 +0000 (12:10 -0800)]
Fixing broken link per b/
19503824.
Change-Id: I4140decb254cf9c9f0eadfce1a3897c240d640d9
Craig Mautner [Fri, 27 Feb 2015 04:40:19 +0000 (20:40 -0800)]
Change ActivityView startActivity state sequence
Problems arise if an activity is started in an ActivityView when the
parent activity is not resumed. In particular the ActivityView can
be brought to the front in front of other activities that have been
started by the parent.
This change checks the state of the parent when the ActivityView is
starting and if it is not resumed, throws an Exception.
This change also removes the queueing up of Intents if the surface
does not exist when startActivity is called. Now, the owner of the
ActivityView is notified when the surface becomes available. If
startActivity is called before that notification an Exception will be
thrown.
Fixes bug
19147472.
Change-Id: I6712cf1929fe65c4238ce7f3feb4e8511ed97244
Joe Fernandez [Tue, 3 Mar 2015 06:42:39 +0000 (06:42 +0000)]
am
1137ca03: am
246a3a4a: am
14fcef3b: am
c4418980: am
a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs
* commit '
1137ca03be9b9143c472d9adc51ea511cfd68a6b':
Minor typo fixes in managed profile Javadoc reference pages.
Joe Fernandez [Tue, 3 Mar 2015 06:36:02 +0000 (06:36 +0000)]
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.
Joe Fernandez [Tue, 3 Mar 2015 06:29:33 +0000 (06:29 +0000)]
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.
Joe Fernandez [Tue, 3 Mar 2015 06:22:42 +0000 (06:22 +0000)]
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.
Rich Slogar [Tue, 3 Mar 2015 06:18:54 +0000 (06:18 +0000)]
am
646c7cd6: am
a81ed3cd: docs: support library updates for sdk 22
* commit '
646c7cd6e81904791b7ecc7ab7750ffe4919371b':
docs: support library updates for sdk 22
Joe Fernandez [Tue, 3 Mar 2015 06:15:29 +0000 (06:15 +0000)]
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.
Rich Slogar [Tue, 3 Mar 2015 06:13:41 +0000 (06:13 +0000)]
am
a81ed3cd: docs: support library updates for sdk 22
* commit '
a81ed3cd0f73138832c8386ee66dcbf2b4dce928':
docs: support library updates for sdk 22
Joe Fernandez [Tue, 3 Mar 2015 06:11:49 +0000 (06:11 +0000)]
Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs
Rich Slogar [Tue, 3 Mar 2015 00:09:21 +0000 (16:09 -0800)]
docs: support library updates for sdk 22
Change-Id: I4cb14e6c941652fe02d98ffac32451eea6f4576c
Rich Slogar [Tue, 3 Mar 2015 03:12:54 +0000 (03:12 +0000)]
am
ad334de5: am
e0ce0f2c: docs: platform revisions 5.1
* commit '
ad334de54a89ab755ef16aebf47bb16e287782bc':
docs: platform revisions 5.1
Rich Slogar [Tue, 3 Mar 2015 03:06:48 +0000 (03:06 +0000)]
am
e0ce0f2c: docs: platform revisions 5.1
* commit '
e0ce0f2cc28720316902303209f923e699d604f7':
docs: platform revisions 5.1
Rich Slogar [Tue, 3 Mar 2015 01:54:10 +0000 (17:54 -0800)]
docs: platform revisions 5.1
Change-Id: Iabbd8617e3d334228fec94254160f2e43cdd22c6
Joe Fernandez [Tue, 3 Mar 2015 02:14:32 +0000 (02:14 +0000)]
am
8fe980e8: am
54643332: Merge "Doc change: Add diff report for API 22." into lmp-mr1-dev
* commit '
8fe980e803c6e20f799a12c08e54cadcbc39f6d1':
Doc change: Add diff report for API 22.
Joe Fernandez [Tue, 3 Mar 2015 02:07:29 +0000 (02:07 +0000)]
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.
Joe Fernandez [Tue, 3 Mar 2015 02:03:43 +0000 (02:03 +0000)]
Merge "Doc change: Add diff report for API 22." into lmp-mr1-dev
Joe Fernandez [Tue, 3 Mar 2015 01:54:52 +0000 (01:54 +0000)]
am
a2bbdb96: am
2ba57444: Merge "docs: update Android docs build to include API 22, Android 5.1" into lmp-mr1-dev
* commit '
a2bbdb96303c0fcac696ece07c27a49fbdd1f740':
docs: update Android docs build to include API 22, Android 5.1
Joe Fernandez [Tue, 3 Mar 2015 01:47:26 +0000 (01:47 +0000)]
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
Joe Fernandez [Tue, 3 Mar 2015 01:42:40 +0000 (01:42 +0000)]
Merge "docs: update Android docs build to include API 22, Android 5.1" into lmp-mr1-dev
Rich Slogar [Tue, 3 Mar 2015 01:40:42 +0000 (01:40 +0000)]
am
9b4a363d: am
3f3f842c: am
d54fe112: am
2cbda290: am
69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-docs
* commit '
9b4a363d0d2043c009ce066ae99ddaf1054b5c8d':
docs: sdk tools 24.1 update
Rich Slogar [Tue, 3 Mar 2015 01:34:25 +0000 (01:34 +0000)]
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
Rich Slogar [Tue, 3 Mar 2015 01:27:07 +0000 (01:27 +0000)]
am
d54fe112: am
2cbda290: am
69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-docs
* commit '
d54fe112a24ec3a692d35a4ccf1f73fa5caaaf5e':
docs: sdk tools 24.1 update
Joe Fernandez [Tue, 3 Mar 2015 01:24:50 +0000 (01:24 +0000)]
am
be34916d: am
45ef73b4: Merge "docs: Add Android 5.1 to the uses-sdk manifest docs" into lmp-mr1-dev
* commit '
be34916d448e9cd04bebfa5bf3d61de0c8087d65':
docs: Add Android 5.1 to the uses-sdk manifest docs
Andrew Solovay [Tue, 3 Mar 2015 00:37:59 +0000 (16:37 -0800)]
Minor typo fixes in managed profile Javadoc reference pages.
See first comment for stage location.
bug:
19389235
Change-Id: I2e1d5169a77e3f4000e73f08d493953ce4eee78c
Rich Slogar [Tue, 3 Mar 2015 01:20:33 +0000 (01:20 +0000)]
am
2cbda290: am
69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-docs
* commit '
2cbda290f66b5a17d3542ada26f7e91b3893f72d':
docs: sdk tools 24.1 update
Joe Fernandez [Tue, 3 Mar 2015 01:16:52 +0000 (01:16 +0000)]
am
46c588b9: am
5c6476aa: Merge "docs: Android 5.1 API Release notes (Lollipop MR1)" into lmp-mr1-dev
* commit '
46c588b9394128a2da2c0ce3cea4eef05cea0f12':
docs: Android 5.1 API Release notes (Lollipop MR1)
Joe Fernandez [Tue, 3 Mar 2015 01:15:31 +0000 (01:15 +0000)]
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
Rich Slogar [Tue, 3 Mar 2015 01:13:36 +0000 (01:13 +0000)]
am
69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-docs
* commit '
69b58e74e087159ed5950632b4ab3738a841c633':
docs: sdk tools 24.1 update
OSDN Git Service
