163797 Commits

Author SHA1 Message Date
Rich Slogar
f51020eaaa 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
2015-03-09 19:34:32 +00:00
Rich Slogar
6e1cbe4395 Merge "docs: android plugin for gradle release 1.1.3 release notes" into lmp-docs 2015-03-09 19:29:37 +00:00
Luan Nguyen
408800c3ac 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
2015-03-09 17:54:58 +00:00
Rich Slogar
24387bf7ab docs: build tools revision 22.0.0:
Change-Id: Idcc00e2fb0f30c54f28ad0c12c6fb014df681e76
2015-03-09 10:31:02 -07:00
Luan Nguyen
ea9308cf6b 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
2015-03-09 15:05:44 +00:00
Luan Nguyen
a9639fe619 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
2015-03-09 14:59:12 +00:00
Luan Nguyen
2fcc438f76 am 6a96a778: Merge "docs: Add new partners to Wear index page" into lmp-docs
* commit '6a96a77814a89836ba0a85335479c6b3ea9aec33':
  docs: Add new partners to Wear index page
2015-03-09 14:52:45 +00:00
Luan Nguyen
6a96a77814 Merge "docs: Add new partners to Wear index page" into lmp-docs 2015-03-09 14:47:33 +00:00
Geoff Mendal
d7852b66ab Import translations. DO NOT MERGE
Change-Id: I5057e9ae3a255e9315967eae49f71c862fd53290
Auto-generated-cl: translation import
2015-03-09 05:56:54 -07:00
Rich Slogar
d5322338d8 docs: android plugin for gradle release 1.1.3 release notes
Change-Id: If7ee333e83e0be60c864021e068f024694eb3dd1
2015-03-06 16:17:56 -08:00
Eric Gilmore
f1eab6f5d8 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.
2015-03-06 19:39:52 +00:00
Eric Gilmore
39d47c7c70 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.
2015-03-06 19:33:51 +00:00
Eric Gilmore
a2d342e374 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.
2015-03-06 19:27:14 +00:00
Eric Gilmore
beed933206 am 0bceaacf: Merge "Reworking geofencing training to new API and sample." into lmp-docs
* commit '0bceaacf4221a5b302d12fc085744bb54cbbdd6e':
  Reworking geofencing training to new API and sample.
2015-03-06 19:20:45 +00:00
Eric Gilmore
0bceaacf42 Merge "Reworking geofencing training to new API and sample." into lmp-docs 2015-03-06 19:14:28 +00:00
Eric Gilmore
a0e3eb7ba2 Reworking geofencing training to new API and sample.
Change-Id: Ibc9e2561cd93e73eab87a78f4aabe64ae9c8a0b3
2015-03-06 10:50:59 -08:00
Glenn Kasten
ad97ca8188 am 4c0b2345: am 8f9ae232: am 36d008c5: am 5afdc97f: Fix USB typos
* commit '4c0b23453c35581bdcc5738d047d90c2b56cb3ee':
  Fix USB typos
2015-03-06 16:45:31 +00:00
Glenn Kasten
4c0b23453c am 8f9ae232: am 36d008c5: am 5afdc97f: Fix USB typos
* commit '8f9ae2323e747dfbc09b48c6e29edcffaca4d0c7':
  Fix USB typos
2015-03-06 16:38:48 +00:00
Glenn Kasten
8f9ae2323e am 36d008c5: am 5afdc97f: Fix USB typos
* commit '36d008c5aea036e4c2e62dd8d5453ada72dcdea0':
  Fix USB typos
2015-03-06 16:32:39 +00:00
Glenn Kasten
36d008c5ae am 5afdc97f: Fix USB typos
* commit '5afdc97f2e41845e7ddf512814771d4cdf134171':
  Fix USB typos
2015-03-06 16:25:58 +00:00
Glenn Kasten
5afdc97f2e Fix USB typos
Change-Id: Iefa610a81e9155dcfc687c514611bb7dbba5d7f9
(cherry picked from commit 9e86f6139b62dbc87b7ea97cedf847c847657829)
2015-03-06 16:15:15 +00:00
Dan Sandler
e6a4b44594 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.
2015-03-06 00:10:22 +00:00
Dan Sandler
3581f4c91a Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev 2015-03-06 00:03:37 +00:00
Eric Gilmore
685e6ce830 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.
2015-03-05 23:11:09 +00:00
Eric Gilmore
636a39babb 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.
2015-03-05 23:04:27 +00:00
Eric Gilmore
e95fa2649b 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.
2015-03-05 22:50:16 +00:00
Eric Gilmore
e17b0a14cc am 87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs
* commit '87499b275bc7a8d4a12a3134646769a5c6c34829':
  Re-fixing link, and removing trailing white space.
2015-03-05 22:34:58 +00:00
Eric Gilmore
87499b275b Merge "Re-fixing link, and removing trailing white space." into lmp-docs 2015-03-05 22:00:22 +00:00
Eric Gilmore
08134e649d Re-fixing link, and removing trailing white space.
Change-Id: Ic6cef9862424d5581cf0ad5b8366c7033a9fdd93
2015-03-05 13:39:21 -08:00
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 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