OSDN Git Service

android-x86/frameworks-base.git
9 years agoam 8ab872db: am dcc5a34b: am 08ddf132: am 0c1076b2: Merge "docs: eclipse revisions...
Rich Slogar [Wed, 11 Mar 2015 17:31:57 +0000 (17:31 +0000)]
am 8ab872db: am dcc5a34b: am 08ddf132: am 0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs

* commit '8ab872dba1eff1477cb12da63d1f882260a271ae':
  docs: eclipse revisions update

9 years agoam a493c489: am 5f8e08ed: am 66b4b317: am 0a3f9c7d: docs: Revisions to "Providing...
Andrew Solovay [Wed, 11 Mar 2015 17:31:53 +0000 (17:31 +0000)]
am a493c489: am 5f8e08ed: am 66b4b317: am 0a3f9c7d: docs: Revisions to "Providing Messaging for Auto"

* commit 'a493c48989f3c80dd061b86a6216a622b20dfc7f':
  docs: Revisions to "Providing Messaging for Auto"

9 years agoam dcc5a34b: am 08ddf132: am 0c1076b2: Merge "docs: eclipse revisions update" into...
Rich Slogar [Wed, 11 Mar 2015 17:18:39 +0000 (17:18 +0000)]
am dcc5a34b: am 08ddf132: am 0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs

* commit 'dcc5a34b14ae09598d9c019c0d4706c5e2d00be2':
  docs: eclipse revisions update

9 years agoam 5f8e08ed: am 66b4b317: am 0a3f9c7d: docs: Revisions to "Providing Messaging for...
Andrew Solovay [Wed, 11 Mar 2015 17:18:23 +0000 (17:18 +0000)]
am 5f8e08ed: am 66b4b317: am 0a3f9c7d: docs: Revisions to "Providing Messaging for Auto"

* commit '5f8e08ed2c97bb92232e500e7c32b31b8bbd5dcd':
  docs: Revisions to "Providing Messaging for Auto"

9 years agoam 08ddf132: am 0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs
Rich Slogar [Tue, 10 Mar 2015 19:28:53 +0000 (19:28 +0000)]
am 08ddf132: am 0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs

* commit '08ddf132bfb2117d49ea3ca70861a227c39e8115':
  docs: eclipse revisions update

9 years agoam 0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs
Rich Slogar [Tue, 10 Mar 2015 19:22:33 +0000 (19:22 +0000)]
am 0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs

* commit '0c1076b270bd718cab4b89acc96f6cbbbd1e9774':
  docs: eclipse revisions update

9 years agoMerge "docs: eclipse revisions update" into lmp-docs
Rich Slogar [Tue, 10 Mar 2015 19:15:00 +0000 (19:15 +0000)]
Merge "docs: eclipse revisions update" into lmp-docs

9 years agodocs: eclipse revisions update
Rich Slogar [Thu, 5 Mar 2015 00:56:22 +0000 (16:56 -0800)]
docs: eclipse revisions update

Change-Id: I163f9ef9d8cd0c4e4fe5d7a19b76e239af2ee2d3

9 years agoam 66b4b317: am 0a3f9c7d: docs: Revisions to "Providing Messaging for Auto"
Andrew Solovay [Tue, 10 Mar 2015 15:11:01 +0000 (15:11 +0000)]
am 66b4b317: am 0a3f9c7d: docs: Revisions to "Providing Messaging for Auto"

* commit '66b4b3179b0b98e89daaacf0e4d926c72341ea6a':
  docs: Revisions to "Providing Messaging for Auto"

9 years agoam 464a2bc2: Merge "docs: build tools revision 22.0.0:" into lmp-mr1-dev
Rich Slogar [Tue, 10 Mar 2015 01:31:03 +0000 (01:31 +0000)]
am 464a2bc2: Merge "docs: build tools revision 22.0.0:" into lmp-mr1-dev

* commit '464a2bc261ac3b3ad817e3d5cc7fa8f3dae0a6c3':
  docs: build tools revision 22.0.0:

9 years agoam 0a3f9c7d: docs: Revisions to "Providing Messaging for Auto"
Andrew Solovay [Tue, 10 Mar 2015 01:29:29 +0000 (01:29 +0000)]
am 0a3f9c7d: docs: Revisions to "Providing Messaging for Auto"

* commit '0a3f9c7dd26ba31e75552db6ec0eb27cb7267c00':
  docs: Revisions to "Providing Messaging for Auto"

9 years agoMerge "docs: build tools revision 22.0.0:" into lmp-mr1-dev
Rich Slogar [Mon, 9 Mar 2015 23:42:38 +0000 (23:42 +0000)]
Merge "docs: build tools revision 22.0.0:" into lmp-mr1-dev

9 years agoam 5a604b35: am 00e3efb5: am f51020ea: am 6e1cbe43: Merge "docs: android plugin for...
Rich Slogar [Mon, 9 Mar 2015 19:53:48 +0000 (19:53 +0000)]
am 5a604b35: am 00e3efb5: am f51020ea: am 6e1cbe43: Merge "docs: android plugin for gradle release 1.1.3 release notes" into lmp-docs

* commit '5a604b359cd487d4a01a397e49117d22848e6809':
  docs: android plugin for gradle release 1.1.3 release notes

9 years agodocs: Revisions to "Providing Messaging for Auto"
Andrew Solovay [Wed, 26 Nov 2014 00:20:51 +0000 (16:20 -0800)]
docs: Revisions to "Providing Messaging for Auto"

Added a workflow section and "important classes", and tightened up the
rest of the doc to (hopefully) make it all clearer. See first comment
for doc stage location.

Change-Id: Ifa8db66768a096ae1059ddf17760fee8d74c7c6e

9 years agoam 00e3efb5: am f51020ea: am 6e1cbe43: Merge "docs: android plugin for gradle release...
Rich Slogar [Mon, 9 Mar 2015 19:47:18 +0000 (19:47 +0000)]
am 00e3efb5: am f51020ea: am 6e1cbe43: Merge "docs: android plugin for gradle release 1.1.3 release notes" into lmp-docs

* commit '00e3efb549274ac381c95e359611ce7dcc9542cc':
  docs: android plugin for gradle release 1.1.3 release notes

9 years agoam f51020ea: am 6e1cbe43: Merge "docs: android plugin for gradle release 1.1.3 releas...
Rich Slogar [Mon, 9 Mar 2015 19:40:48 +0000 (19:40 +0000)]
am f51020ea: am 6e1cbe43: Merge "docs: android plugin for gradle release 1.1.3 release notes" into lmp-docs

* commit 'f51020eaaaff9f54cee1ba91ab35d0212ddb0f54':
  docs: android plugin for gradle release 1.1.3 release notes

9 years agoam 6e1cbe43: Merge "docs: android plugin for gradle release 1.1.3 release notes"...
Rich Slogar [Mon, 9 Mar 2015 19:34:32 +0000 (19:34 +0000)]
am 6e1cbe43: Merge "docs: android plugin for gradle release 1.1.3 release notes" into lmp-docs

* commit '6e1cbe43957b18f471f82682b5df999578230230':
  docs: android plugin for gradle release 1.1.3 release notes

9 years agoMerge "docs: android plugin for gradle release 1.1.3 release notes" into lmp-docs
Rich Slogar [Mon, 9 Mar 2015 19:29:36 +0000 (19:29 +0000)]
Merge "docs: android plugin for gradle release 1.1.3 release notes" into lmp-docs

9 years agoam ea9308cf: am a9639fe6: am 2fcc438f: am 6a96a778: Merge "docs: Add new partners...
Luan Nguyen [Mon, 9 Mar 2015 17:54:58 +0000 (17:54 +0000)]
am ea9308cf: am a9639fe6: am 2fcc438f: am 6a96a778: Merge "docs: Add new partners to Wear index page" into lmp-docs

* commit 'ea9308cf6b95858ef4f16222ebb8809621b801ae':
  docs: Add new partners to Wear index page

9 years agodocs: build tools revision 22.0.0:
Rich Slogar [Tue, 3 Mar 2015 02:11:33 +0000 (18:11 -0800)]
docs: build tools revision 22.0.0:

Change-Id: Idcc00e2fb0f30c54f28ad0c12c6fb014df681e76

9 years agoam a9639fe6: am 2fcc438f: am 6a96a778: Merge "docs: Add new partners to Wear index...
Luan Nguyen [Mon, 9 Mar 2015 15:05:44 +0000 (15:05 +0000)]
am a9639fe6: am 2fcc438f: am 6a96a778: Merge "docs: Add new partners to Wear index page" into lmp-docs

* commit 'a9639fe619591888fcc97475de15a55017dd1ff7':
  docs: Add new partners to Wear index page

9 years agoam 2fcc438f: am 6a96a778: Merge "docs: Add new partners to Wear index page" into...
Luan Nguyen [Mon, 9 Mar 2015 14:59:12 +0000 (14:59 +0000)]
am 2fcc438f: am 6a96a778: Merge "docs: Add new partners to Wear index page" into lmp-docs

* commit '2fcc438f765789e1786cdfe612f61b034ad7344b':
  docs: Add new partners to Wear index page

9 years agoam 6a96a778: Merge "docs: Add new partners to Wear index page" into lmp-docs
Luan Nguyen [Mon, 9 Mar 2015 14:52:45 +0000 (14:52 +0000)]
am 6a96a778: Merge "docs: Add new partners to Wear index page" into lmp-docs

* commit '6a96a77814a89836ba0a85335479c6b3ea9aec33':
  docs: Add new partners to Wear index page

9 years agoMerge "docs: Add new partners to Wear index page" into lmp-docs
Luan Nguyen [Mon, 9 Mar 2015 14:47:31 +0000 (14:47 +0000)]
Merge "docs: Add new partners to Wear index page" into lmp-docs

9 years agoImport translations. DO NOT MERGE
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

9 years agodocs: android plugin for gradle release 1.1.3 release notes
Rich Slogar [Sat, 7 Mar 2015 00:12:26 +0000 (16:12 -0800)]
docs: android plugin for gradle release 1.1.3 release notes

Change-Id: If7ee333e83e0be60c864021e068f024694eb3dd1

9 years agoam 39d47c7c: am a2d342e3: am beed9332: am 0bceaacf: Merge "Reworking geofencing train...
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.

9 years agoam a2d342e3: am beed9332: am 0bceaacf: Merge "Reworking geofencing training to new...
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.

9 years agoam beed9332: am 0bceaacf: Merge "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.

9 years agoam 0bceaacf: Merge "Reworking geofencing training to new API and sample." into lmp...
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.

9 years agoMerge "Reworking geofencing training to new API and sample." into lmp-docs
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

9 years agoReworking geofencing training to new API and sample.
Eric Gilmore [Fri, 30 Jan 2015 00:21:43 +0000 (16:21 -0800)]
Reworking geofencing training to new API and sample.

Change-Id: Ibc9e2561cd93e73eab87a78f4aabe64ae9c8a0b3

9 years agoam 4c0b2345: am 8f9ae232: am 36d008c5: am 5afdc97f: Fix USB typos
Glenn Kasten [Fri, 6 Mar 2015 16:45:31 +0000 (16:45 +0000)]
am 4c0b2345: am 8f9ae232: am 36d008c5: am 5afdc97f: Fix USB typos

* commit '4c0b23453c35581bdcc5738d047d90c2b56cb3ee':
  Fix USB typos

9 years agoam 8f9ae232: am 36d008c5: am 5afdc97f: Fix USB typos
Glenn Kasten [Fri, 6 Mar 2015 16:38:48 +0000 (16:38 +0000)]
am 8f9ae232: am 36d008c5: am 5afdc97f: Fix USB typos

* commit '8f9ae2323e747dfbc09b48c6e29edcffaca4d0c7':
  Fix USB typos

9 years agoam 36d008c5: am 5afdc97f: Fix USB typos
Glenn Kasten [Fri, 6 Mar 2015 16:32:39 +0000 (16:32 +0000)]
am 36d008c5: am 5afdc97f: Fix USB typos

* commit '36d008c5aea036e4c2e62dd8d5453ada72dcdea0':
  Fix USB typos

9 years agoam 5afdc97f: Fix USB typos
Glenn Kasten [Fri, 6 Mar 2015 16:25:58 +0000 (16:25 +0000)]
am 5afdc97f: Fix USB typos

* commit '5afdc97f2e41845e7ddf512814771d4cdf134171':
  Fix USB typos

9 years agoFix USB typos
Glenn Kasten [Thu, 31 Jul 2014 18:11:11 +0000 (11:11 -0700)]
Fix USB typos

Change-Id: Iefa610a81e9155dcfc687c514611bb7dbba5d7f9
(cherry picked from commit 9e86f6139b62dbc87b7ea97cedf847c847657829)

9 years agoam 3581f4c9: Merge "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.

9 years agoMerge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp...
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

9 years agoam 636a39ba: am e95fa264: am e17b0a14: am 87499b27: Merge "Re-fixing link, and removi...
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.

9 years agoam e95fa264: am e17b0a14: am 87499b27: Merge "Re-fixing link, and removing trailing...
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.

9 years agoam e17b0a14: am 87499b27: Merge "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.

9 years agoam 87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp...
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.

9 years agoMerge "Re-fixing link, and removing trailing white space." into lmp-docs
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

9 years agoRe-fixing link, and removing trailing white space.
Eric Gilmore [Thu, 5 Mar 2015 21:39:21 +0000 (13:39 -0800)]
Re-fixing link, and removing trailing white space.

Change-Id: Ic6cef9862424d5581cf0ad5b8366c7033a9fdd93

9 years agoam bc669e3f: am dad1cbeb: am 9f485e97: am 4aba69a8: 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

9 years agoam dad1cbeb: am 9f485e97: am 4aba69a8: 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

9 years agoam 9f485e97: am 4aba69a8: 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

9 years agoam 4aba69a8: 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

9 years agodocs: 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

9 years agoam 8b2be54a: am 182059f8: am ca10a435: am f4bbec09: Merge "add tags for wakelock...
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

9 years agoam 182059f8: am ca10a435: am f4bbec09: Merge "add tags for wakelock and other API...
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

9 years agoam ca10a435: am f4bbec09: Merge "add tags for wakelock and other API names" into...
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

9 years agoam f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs
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

9 years agoam 498691d2: am 62777b18: am 5c30adfd: am 22d1c1ce: Merge "Fixing broken link per...
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.

9 years agoMerge "add tags for wakelock and other API names" into lmp-docs
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

9 years agoam 62777b18: am 5c30adfd: am 22d1c1ce: Merge "Fixing broken link per b/19503824....
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.

9 years agoam 4eedcceb: Merge "Merge commit \'83a63bac\' into manualmerge" into lmp-mr1-dev
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

9 years agoMerge "Merge commit '83a63bac' into manualmerge" into lmp-mr1-dev
Bart Sears [Thu, 5 Mar 2015 00:35:07 +0000 (00:35 +0000)]
Merge "Merge commit '83a63bac' into manualmerge" into lmp-mr1-dev

9 years agoam c974ac11: 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.

9 years agoMediaProjectionPermissionActivity: Fix NPE.
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)

9 years agoMerge commit '83a63bac' into manualmerge
Craig Mautner [Wed, 4 Mar 2015 18:10:34 +0000 (10:10 -0800)]
Merge commit '83a63bac' into manualmerge

9 years agoam 5c30adfd: am 22d1c1ce: Merge "Fixing broken link per b/19503824." into lmp-docs
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.

9 years agoam 22d1c1ce: Merge "Fixing broken link per b/19503824." into lmp-docs
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.

9 years agoMerge "Fixing broken link per b/19503824." into lmp-docs
Eric Gilmore [Wed, 4 Mar 2015 17:40:15 +0000 (17:40 +0000)]
Merge "Fixing broken link per b/19503824." into lmp-docs

9 years agoam 8fa394fa: Merge "Do not make ActivityContainer available to apps. DO NOT MERGE...
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

9 years agoMerge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-dev
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

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Wed, 4 Mar 2015 14:04:03 +0000 (14:04 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

9 years agoImport translations. DO NOT MERGE
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

9 years agoImport translations. DO NOT MERGE
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

9 years agoAvoid crashing on startup when policy forbids lockscreen camera.
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

9 years agodocs: Add new partners to Wear index page
Luan Nguyen [Tue, 3 Mar 2015 19:08:24 +0000 (11:08 -0800)]
docs: Add new partners to Wear index page

bug: 19550254
Change-Id: If5f4722ff480e965cce998bd6383d3a2df0cfe0d

9 years agoFixing broken link per b/19503824.
Eric Gilmore [Tue, 3 Mar 2015 20:10:19 +0000 (12:10 -0800)]
Fixing broken link per b/19503824.

Change-Id: I4140decb254cf9c9f0eadfce1a3897c240d640d9

9 years agoam 246a3a4a: am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in manage...
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.

9 years agoam 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile...
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.

9 years agoam c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc referenc...
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.

9 years agoam a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages....
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.

9 years agoam a81ed3cd: docs: support library updates for sdk 22
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

9 years agoMerge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs
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

9 years agodocs: support library updates for sdk 22
Rich Slogar [Tue, 3 Mar 2015 00:09:21 +0000 (16:09 -0800)]
docs: support library updates for sdk 22

Change-Id: I4cb14e6c941652fe02d98ffac32451eea6f4576c

9 years agoam e0ce0f2c: 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

9 years agodocs: 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

9 years agoam 54643332: Merge "Doc change: Add diff report for API 22." into lmp-mr1-dev
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.

9 years agoMerge "Doc change: Add diff report for API 22." into lmp-mr1-dev
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

9 years agoam 2ba57444: Merge "docs: update Android docs build to include API 22, Android 5...
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

9 years agoMerge "docs: update Android docs build to include API 22, Android 5.1" into lmp-mr1-dev
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

9 years agoam 3f3f842c: am d54fe112: am 2cbda290: am 69b58e74: Merge "docs: sdk tools 24.1 updat...
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

9 years agoam d54fe112: am 2cbda290: am 69b58e74: Merge "docs: sdk tools 24.1 update" into lmp...
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

9 years agoMinor typo fixes in managed profile Javadoc reference pages.
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

9 years agoam 2cbda290: am 69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-docs
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

9 years agoam 45ef73b4: Merge "docs: Add Android 5.1 to the uses-sdk manifest docs" into lmp...
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

9 years agoam 69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-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

9 years agoMerge "docs: sdk tools 24.1 update" into lmp-docs
Rich Slogar [Tue, 3 Mar 2015 01:07:38 +0000 (01:07 +0000)]
Merge "docs: sdk tools 24.1 update" into lmp-docs

9 years agoam 5c6476aa: Merge "docs: Android 5.1 API Release notes (Lollipop MR1)" into lmp...
Joe Fernandez [Tue, 3 Mar 2015 01:06:10 +0000 (01:06 +0000)]
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)

9 years agoMerge "docs: Add Android 5.1 to the uses-sdk manifest docs" into lmp-mr1-dev
Joe Fernandez [Tue, 3 Mar 2015 01:02:54 +0000 (01:02 +0000)]
Merge "docs: Add Android 5.1 to the uses-sdk manifest docs" into lmp-mr1-dev

9 years agoMerge "docs: Android 5.1 API Release notes (Lollipop MR1)" into lmp-mr1-dev
Joe Fernandez [Tue, 3 Mar 2015 00:56:42 +0000 (00:56 +0000)]
Merge "docs: Android 5.1 API Release notes (Lollipop MR1)" into lmp-mr1-dev

9 years agodocs: Add Android 5.1 to the uses-sdk manifest docs
Joe Fernandez [Tue, 3 Mar 2015 00:43:14 +0000 (16:43 -0800)]
docs: Add Android 5.1 to the uses-sdk manifest docs

Change-Id: Idf9962af4250e68ed885571a57b9a51a40f74267

9 years agodocs: update Android docs build to include API 22, Android 5.1
Joe Fernandez [Mon, 2 Mar 2015 23:53:38 +0000 (15:53 -0800)]
docs: update Android docs build to include API 22, Android 5.1

Change-Id: If41c1a142db0f2df439afaa9cf5d0fe0ca47d2c0

9 years agodocs: Android 5.1 API Release notes (Lollipop MR1)
Joe Fernandez [Fri, 27 Feb 2015 05:55:07 +0000 (21:55 -0800)]
docs: Android 5.1 API Release notes (Lollipop MR1)

Change-Id: I47f59ade26086b8368d8b395f92992edc27510d0

9 years agoam bcced5b8: Merge "Fix incorrect condition for sub id check." into lmp-mr1-dev
Shishir Agrawal [Mon, 2 Mar 2015 22:38:43 +0000 (22:38 +0000)]
am bcced5b8: Merge "Fix incorrect condition for sub id check." into lmp-mr1-dev

* commit 'bcced5b834e49bf3a0b57a0009958ba061d31e76':
  Fix incorrect condition for sub id check.