OSDN Git Service
Andrew Solovay [Wed, 11 Mar 2015 17:42:50 +0000 (17:42 +0000)]
am
3d950de4: am
a493c489: am
5f8e08ed: am
66b4b317: am
0a3f9c7d: docs: Revisions to "Providing Messaging for Auto"
* commit '
3d950de4d4028e0c7763932c00c372d41c832e87':
docs: Revisions to "Providing Messaging for Auto"
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"
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"
Prashant Malani [Wed, 11 Feb 2015 03:09:39 +0000 (19:09 -0800)]
Make circular mask thickness configurable
Obtain the circular mask thickness as a dimension so that it can
be customized per-device.
Change-Id: Ied88f91424c5cf4f25dd1e78cf22f0fd7ea7b0a4
Signed-off-by: Prashant Malani <pmalani@google.com>
Justin Koh [Tue, 10 Mar 2015 20:37:05 +0000 (20:37 +0000)]
Merge "Add translatable=false to dozeComponent" into lmp-mr1-modular-dev
Justin Koh [Tue, 10 Mar 2015 20:12:51 +0000 (13:12 -0700)]
Add translatable=false to dozeComponent
Add translatable=false to dozeComponent: this prevents it from breaking with
en_XA pseudolocalization.
Change-Id: I53a77d8590c65189633b89fed67d247115e75df9
Mark Renouf [Tue, 10 Mar 2015 16:38:53 +0000 (16:38 +0000)]
Merge "Adds system property for developer option for force-enable burn-in protection" into lmp-mr1-modular-dev
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"
Rich Slogar [Tue, 10 Mar 2015 15:08:58 +0000 (15:08 +0000)]
am
ccc24997: am
464a2bc2: Merge "docs: build tools revision 22.0.0:" into lmp-mr1-dev
* commit '
ccc24997a37a7ee96b80f4dc4f43ea52d2c2cd46':
docs: build tools revision 22.0.0:
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:
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"
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
Rich Slogar [Mon, 9 Mar 2015 19:59:42 +0000 (19:59 +0000)]
am
282099b5: am
5a604b35: am
00e3efb5: am
f51020ea: am
6e1cbe43: Merge "docs: android plugin for gradle release 1.1.3 release notes" into lmp-docs
* commit '
282099b57f23814a95128e37bdb5a5a1971ede67':
docs: android plugin for gradle release 1.1.3 release notes
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
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
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
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
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
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
Luan Nguyen [Mon, 9 Mar 2015 18:03:19 +0000 (18:03 +0000)]
am
408800c3: am
ea9308cf: am
a9639fe6: am
2fcc438f: am
6a96a778: Merge "docs: Add new partners to Wear index page" into lmp-docs
* commit '
408800c3aca72d150dacb646d0a455b248fc3db0':
docs: Add new partners to Wear index page
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
Rich Slogar [Tue, 3 Mar 2015 02:11:33 +0000 (18:11 -0800)]
docs: build tools revision 22.0.0:
Change-Id: Idcc00e2fb0f30c54f28ad0c12c6fb014df681e76
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)]
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
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
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
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
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
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
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
Mark Renouf [Fri, 27 Feb 2015 00:22:08 +0000 (19:22 -0500)]
Adds system property for developer option for force-enable burn-in protection
BUG:
18428140
Change-Id: Ie1b88e84631310541337b4e9b3120c1390d6767b
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
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
Craig Mautner [Tue, 3 Mar 2015 21:03:28 +0000 (21:03 +0000)]
Merge "Change ActivityView startActivity state sequence" into lmp-mr1-modular-dev