Nick Kralevich
cfea9fbc53
resolved conflicts for merge of 175ef812 to master
...
Change-Id: I2c6f407fa56b13c54571f8a51573a4b45d251dbb
2015-01-06 11:50:08 -08:00
Joe Fernandez
17197b856b
am e7558b44: am 596868b6: am c811b88a: am d3d09d87: am 66e851fa: Merge "docs: studio workflow links" into lmp-docs
...
automerge: 8109599b
* commit '8109599b1c6306d1f2239a88f0cf9ba3ea584f2b':
docs: studio workflow links
2015-01-06 19:36:41 +00:00
Nick Kralevich
0e55e3565e
resolved conflicts for merge of 1779fd15 to master
...
Change-Id: I36b60b943a9cfe53bbbf455cf4e94579bfbfbc69
2015-01-06 11:29:44 -08:00
Quddus Chong
8a195822e2
Merge "docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug: 18759727" into lmp-docs
2015-01-06 18:10:38 +00:00
Quddus Chong
3bdc68edcf
Merge "docs: Updated GMS version numbering to be consistent with blog post. bug: 18718181" into lmp-docs
2015-01-06 18:10:17 +00:00
Quddus Chong
b55e2bf0e0
Merge "docs: Updated the description of the enhanced camera APIs in L. bug: 18142680" into lmp-docs
2015-01-06 18:09:45 +00:00
Joe Fernandez
91c35ce153
Merge "docs: studio index typo" into lmp-docs
2015-01-06 17:50:58 +00:00
Joe Fernandez
acb35e19d1
Merge "docs: studio bundle checksum update" into lmp-docs
2015-01-06 17:46:04 +00:00
Joe Fernandez
26994aa7d4
Merge "docs: Checklist for TV Apps" into lmp-docs
2015-01-06 04:35:33 +00:00
Ricardo Cervera
2b2ad7ce9f
am 4d4b599d: am ac4444a2: am c5fae959: am 48a066db: am 60cfb01a: Merge "docs: Update wearable lists docs" into lmp-docs
...
automerge: 0281909
* commit '02819090ece2ed8ff4161a560fcb5acb8c0b9cb5':
docs: Update wearable lists docs
2015-01-06 02:39:22 +00:00
Joe Fernandez
1b0c367a32
am bea6f1e6: am b1062ad6: am c3fb32ab: am 4603c122: am 18a75595: Merge "docs: studio device emulator updates" into lmp-docs
...
automerge: 66a49d9
* commit '66a49d994c997e74fcab7ce5b4e334cfd742d36c':
docs: studio device emulator updates
2015-01-06 02:37:41 +00:00
Sarah Maddox
041855e06d
am 73c943fc: am 15e94fdf: am 4811f9b8: am ecf0ac29: am ca23a587: Merge "docs: Updates the request-location-updates lesson in the location APIs training course." into lmp-docs
...
automerge: d259fb3
* commit 'd259fb3757f0813b3bb13dea9a65c6cab6617fc6':
docs: Updates the request-location-updates lesson in the location APIs training course.
2015-01-06 02:35:42 +00:00
Ricardo Cervera
509bd3a959
am fd731d4b: am fcba6472: am 9719336b: am 4ef7873d: am 8e631d2d: Merge "docs: Adding vector drawables video" into lmp-docs
...
automerge: 2d90b49
* commit '2d90b49ad2caa3f765ed9b4b8eab31da711f4d19':
docs: Adding vector drawables video
2015-01-06 02:34:17 +00:00
Joe Fernandez
f7f6bbc319
am 5ec2afea: am f3d9f030: am adaef486: am e78489b4: am e22b42b3: Merge "docs: plugin reference update" into lmp-docs
...
automerge: 4d0c931
* commit '4d0c931be7b63ebcd5789b99c5f561b411823485':
docs: plugin reference update
2015-01-06 02:32:24 +00:00
Andrew Solovay
7dd1f66bb6
am eeaf280d: am ff62a5ee: am 4c7390d3: am b663f2fc: am 713cd74e: docs: New "app compatibility with managed profiles" doc
...
* commit 'eeaf280dc7e1feab293e0bf35398b45009c9f5b2':
docs: New "app compatibility with managed profiles" doc
2015-01-06 02:27:02 +00:00
Joe Fernandez
7cf74ee6e2
am c632031a: am 27195338: am 546a0e8c: am 60925265: am afc3b9e7: Merge "docs: studio build output dir name update" into lmp-docs
...
* commit 'c632031af3ffb5e166ad25e78d41757b9b35ce84':
docs: studio build output dir name update
2015-01-06 02:26:55 +00:00
Joe Fernandez
629612a9d2
am 06cdc2fd: am 851931f0: am 21b92f34: am 43f4e8fa: am 27cb0a56: Merge "docs: gradle version update in plugin file" into lmp-docs
...
* commit '06cdc2fd640c37b7251bc5ce37051e4da0b3552a':
docs: gradle version update in plugin file
2015-01-06 02:26:49 +00:00
Joe Fernandez
148a57877e
am 4dc7c158: am 3dcc1289: am 447ea509: am f110d357: am 8eaf4042: Merge "docs: gradle wrapper security note" into lmp-docs
...
* commit '4dc7c15860faa53f6cc408046959c7e8e6ebfd51':
docs: gradle wrapper security note
2015-01-06 02:26:44 +00:00
Joe Fernandez
175ef8121b
am 24a3ff47: am 765ae116: am eed87a57: am 09b41c02: am e6395cd3: Merge "docs: project file and toc updates" into lmp-docs
...
* commit '24a3ff477037a634e7ae6bc99908faebd530d0a9':
docs: project file and toc updates
2015-01-06 02:26:38 +00:00
Joe Fernandez
8109599b1c
am e7558b44: am 596868b6: am c811b88a: am d3d09d87: am 66e851fa: Merge "docs: studio workflow links" into lmp-docs
...
* commit 'e7558b44f707979cb4f85b0ccd0862b9ea068ee6':
docs: studio workflow links
2015-01-06 02:26:32 +00:00
Joe Fernandez
1779fd1514
am d1489d5d: am a78664e0: am 411c779b: am c919f7cf: am 1092bafa: Merge "docs: studio tips and ticks grammmar typo" into lmp-docs
...
* commit 'd1489d5db00d030b873fe84f32fa5bd453152824':
docs: studio tips and ticks grammmar typo
2015-01-06 02:26:25 +00:00
Ricardo Cervera
02819090ec
am 4d4b599d: am ac4444a2: am c5fae959: am 48a066db: am 60cfb01a: Merge "docs: Update wearable lists docs" into lmp-docs
...
* commit '4d4b599d7c864d44267979fa71ca5b0bb27171b5':
docs: Update wearable lists docs
2015-01-06 02:26:18 +00:00
Joe Fernandez
66a49d994c
am bea6f1e6: am b1062ad6: am c3fb32ab: am 4603c122: am 18a75595: Merge "docs: studio device emulator updates" into lmp-docs
...
* commit 'bea6f1e6457841b8be4e45ecb713762894799f7a':
docs: studio device emulator updates
2015-01-06 02:26:11 +00:00
Sarah Maddox
d259fb3757
am 73c943fc: am 15e94fdf: am 4811f9b8: am ecf0ac29: am ca23a587: Merge "docs: Updates the request-location-updates lesson in the location APIs training course." into lmp-docs
...
* commit '73c943fc71bbb35bd494b24cc649eaa168f3c1e5':
docs: Updates the request-location-updates lesson in the location APIs training course.
2015-01-06 02:26:05 +00:00
Ricardo Cervera
2d90b49ad2
am fd731d4b: am fcba6472: am 9719336b: am 4ef7873d: am 8e631d2d: Merge "docs: Adding vector drawables video" into lmp-docs
...
* commit 'fd731d4bebed075f1c1d4130c22dbb7475ec8efe':
docs: Adding vector drawables video
2015-01-06 02:25:58 +00:00
Joe Fernandez
4d0c931be7
am 5ec2afea: am f3d9f030: am adaef486: am e78489b4: am e22b42b3: Merge "docs: plugin reference update" into lmp-docs
...
* commit '5ec2afea01be51e5607e445c401be3296f1ac83e':
docs: plugin reference update
2015-01-06 02:25:47 +00:00
Andrew Solovay
ff62a5eea7
am 4c7390d3: am b663f2fc: am 713cd74e: docs: New "app compatibility with managed profiles" doc
...
* commit '4c7390d392dfe4a5df626ce28d415e01cab7d132':
docs: New "app compatibility with managed profiles" doc
2015-01-06 02:02:02 +00:00
Joe Fernandez
2719533819
am 546a0e8c: am 60925265: am afc3b9e7: Merge "docs: studio build output dir name update" into lmp-docs
...
* commit '546a0e8c695808c987be3fbac1b3e632b6c6aa8d':
docs: studio build output dir name update
2015-01-06 02:01:14 +00:00
Joe Fernandez
851931f062
am 21b92f34: am 43f4e8fa: am 27cb0a56: Merge "docs: gradle version update in plugin file" into lmp-docs
...
* commit '21b92f34525e12ede8f842f6c426d33093df3b24':
docs: gradle version update in plugin file
2015-01-06 02:01:09 +00:00
Joe Fernandez
3dcc12892f
am 447ea509: am f110d357: am 8eaf4042: Merge "docs: gradle wrapper security note" into lmp-docs
...
* commit '447ea5097ba99ca25ddd613e72e10b57f3405291':
docs: gradle wrapper security note
2015-01-06 02:01:05 +00:00
Joe Fernandez
765ae116e2
am eed87a57: am 09b41c02: am e6395cd3: Merge "docs: project file and toc updates" into lmp-docs
...
* commit 'eed87a573a2e67c85f5a8e79ad538cce278932d2':
docs: project file and toc updates
2015-01-06 02:01:01 +00:00
Joe Fernandez
596868b648
am c811b88a: am d3d09d87: am 66e851fa: Merge "docs: studio workflow links" into lmp-docs
...
* commit 'c811b88ab1bc891fffdef461ead0f6dc7331d04e':
docs: studio workflow links
2015-01-06 02:00:57 +00:00
Joe Fernandez
a78664e030
am 411c779b: am c919f7cf: am 1092bafa: Merge "docs: studio tips and ticks grammmar typo" into lmp-docs
...
* commit '411c779bb746d81278b7646ffd96fa6e4f8336b9':
docs: studio tips and ticks grammmar typo
2015-01-06 02:00:53 +00:00
Ricardo Cervera
ac4444a26f
am c5fae959: am 48a066db: am 60cfb01a: Merge "docs: Update wearable lists docs" into lmp-docs
...
* commit 'c5fae9593553a89db2ad49306b46b8f9a3631489':
docs: Update wearable lists docs
2015-01-06 02:00:48 +00:00
Joe Fernandez
b1062ad68e
am c3fb32ab: am 4603c122: am 18a75595: Merge "docs: studio device emulator updates" into lmp-docs
...
* commit 'c3fb32ab3989806f49cdd21ca58a044daf74f060':
docs: studio device emulator updates
2015-01-06 02:00:42 +00:00
Sarah Maddox
15e94fdf34
am 4811f9b8: am ecf0ac29: am ca23a587: Merge "docs: Updates the request-location-updates lesson in the location APIs training course." into lmp-docs
...
* commit '4811f9b84766adc17efb730160e15785d74875a3':
docs: Updates the request-location-updates lesson in the location APIs training course.
2015-01-06 02:00:32 +00:00
Ricardo Cervera
fcba64722b
am 9719336b: am 4ef7873d: am 8e631d2d: Merge "docs: Adding vector drawables video" into lmp-docs
...
* commit '9719336b3a9a059c31200137a93f74445d3c7185':
docs: Adding vector drawables video
2015-01-06 02:00:24 +00:00
Joe Fernandez
f3d9f03053
am adaef486: am e78489b4: am e22b42b3: Merge "docs: plugin reference update" into lmp-docs
...
* commit 'adaef486464af836cd3408657634c972419e4c80':
docs: plugin reference update
2015-01-06 02:00:14 +00:00
Scott Rowe
7515d188dd
docs: Checklist for TV Apps
...
Change-Id: I93b57161b3e519164dab551068411f686d772596
2015-01-05 17:50:59 -08:00
Rich Slogar
626128b1db
docs: studio bundle checksum update
...
Change-Id: I3307009db1be1c4d6f01d158d577a6c373b316bf
2015-01-05 16:23:55 -08:00
Quddus Chong
32176c4ca1
docs: Updated GMS version numbering to be consistent with blog post.
...
bug: 18718181
Change-Id: I185157d84ebfe4ecc7b166b44d3d4735d8a106e3
2015-01-05 15:55:13 -08:00
Ricardo Cervera
fa6fb0daa5
docs: Minor fixes to Watch Faces design guidelines.
...
Change-Id: I1b9c26d12bac1b5e5d649e7ea665f58b50d621d7
2015-01-05 15:03:34 -08:00
Quddus Chong
1139a0a4a2
docs: Added explicit filepath for Android Media Browser and Android Messaging simulators.
...
bug: 18759727
Change-Id: Ided6dc4f30d43f8fce252e56a6291bbb1a3d2e05
2015-01-05 15:01:27 -08:00
Rich Slogar
ee371073f1
docs: studio index typo
...
Change-Id: I185e59cdba604ee894bc08f55ebb042281d44cd2
2015-01-05 14:47:19 -08:00
Quddus Chong
5619d929a6
docs: Updated the description of the enhanced camera APIs in L.
...
bug: 18142680
Change-Id: I0b15048bb099443a4cb790fbd2100456f2bfa4d6
2015-01-05 14:15:45 -08:00
Ricardo Cervera
4bb503cf12
docs: Minor fixes in Android Studio pages.
...
https://code.google.com/p/android/issues/detail?id=92839
https://code.google.com/p/android/issues/detail?id=92840
https://code.google.com/p/android/issues/detail?id=92661
Change-Id: I8a45112371da6ca144e0da28701a92254d98774b
2015-01-05 09:31:41 -08:00
Sarah Maddox
ab5159310a
Merge "docs: Fixes typo on Play services page for Maps." into lmp-docs
2014-12-23 02:20:23 +00:00
Sarah Maddox
71de8ea11f
docs: Fixes typo on Play services page for Maps.
...
Bug: 18832605
Change-Id: I31cd802c80fe5f1c5b0c600859e9a32b020344e7
2014-12-23 13:08:08 +11:00
Joe Fernandez
76db15a8c9
docs: fix problem with TOC after Japanese pages merge
...
Change-Id: I75c78bd600907467fa81af197df216d5e6a31b1f
2014-12-19 22:38:47 -08:00
David Friedman
58a5e3db00
Merge "Android TV initial (time-sensitive) localization release for Japanese partners. Bug: 18527238 Change-Id: Id933695738a07aa0a1c02783e022dd8b98bbf98e" into lmp-docs
2014-12-20 02:04:39 +00:00
