smain@google.com
87e74132bf
am eb9a4607: am 1d97aebd: am 9af05a68: am 16d9a037: am 68e6819b: brute force improve suggestions for sdk download automerge: c21b455
...
* commit 'eb9a46075f13cb0c0ffbb1dd9cf935fd694f1b76':
brute force improve suggestions for sdk download
2014-12-16 11:02:38 +00:00
Narayan Kamath
d02a898528
resolved conflicts for merge of f44fdaed to master
...
Change-Id: I324b252123b7fc4a38aad9be4b986cb564a17b14
2014-12-16 10:57:05 +00:00
smain@google.com
5eb5d9f712
am f912c21e: am a01e83b2: am 8bb3962b: am 8e8f29e3: Merge "fix distribute nav styles. they were not highlighted correctly." into lmp-docs automerge: 63ed5e1
...
automerge: b1eb5c9
* commit 'b1eb5c97d6601cd57378e17c2e6d9e75d0cea52c':
fix distribute nav styles. they were not highlighted correctly.
2014-12-16 02:39:25 +00:00
Joe Fernandez
ac45fe9fb5
am 9a0be7d3: am 519fbf3a: am 4234fca6: am 044f3947: Merge "docs: uiautomator blog link removal" into lmp-docs automerge: d799f75
...
automerge: 11341c4
* commit '11341c4d32c76e32a2df22a166085e6ede2fcdc7':
docs: uiautomator blog link removal
2014-12-16 02:38:19 +00:00
Joe Fernandez
7e5e1ccdad
am e33b63fe: am 9a05dee5: am e70cb874: am c59d1d78: Merge "docs: studio basics typo" into lmp-docs automerge: 72268ad
...
automerge: d6bba15
* commit 'd6bba15c032270f9545b20cbf6fa8792559ce1fb':
docs: studio basics typo
2014-12-16 02:37:07 +00:00
Luan Nguyen
63e6d11224
am 443e57df: am 556ce7f1: am 47efca78: am a854ddfd: docs: Add two new general functionality requirements automerge: bb01880
...
automerge: 56102be
* commit '56102be8922e888a2eb42a97e5977d17e63e16aa':
docs: Add two new general functionality requirements
2014-12-16 02:35:45 +00:00
Sarah Maddox
91a41ac173
am 99c5ac9e: am 48f9c8e4: am aaa37da8: am a158abe4: Merge "docs: Updates lesson 1 of location API training: Get last-known location." into lmp-docs automerge: 8f0f627
...
* commit '99c5ac9e14db60abb8186c4737803b4cf90c1dc0':
docs: Updates lesson 1 of location API training: Get last-known location.
2014-12-16 02:31:39 +00:00
smain@google.com
eb9a46075f
am 1d97aebd: am 9af05a68: am 16d9a037: am 68e6819b: brute force improve suggestions for sdk download automerge: c21b455
...
* commit '1d97aebdd96105fd0b24587406acbedec451a5ad':
brute force improve suggestions for sdk download
2014-12-16 02:31:34 +00:00
Rich Slogar
f44fdaedbf
am ccaf3552: am 57911088: am 895d1694: am 6b8756c3: docs: studio 1.0.1 revision update automerge: b2a9bd5
...
* commit 'ccaf3552e62bb7ef2373bd4c282d275a209b7d91':
docs: studio 1.0.1 revision update
2014-12-16 02:31:29 +00:00
smain@google.com
b1eb5c97d6
am f912c21e: am a01e83b2: am 8bb3962b: am 8e8f29e3: Merge "fix distribute nav styles. they were not highlighted correctly." into lmp-docs automerge: 63ed5e1
...
* commit 'f912c21e4325c87798ae6930ca734fb18636f9e5':
fix distribute nav styles. they were not highlighted correctly.
2014-12-16 02:31:23 +00:00
Joe Fernandez
11341c4d32
am 9a0be7d3: am 519fbf3a: am 4234fca6: am 044f3947: Merge "docs: uiautomator blog link removal" into lmp-docs automerge: d799f75
...
* commit '9a0be7d31da7c340fd1f5b57c9e1527726697fcc':
docs: uiautomator blog link removal
2014-12-16 02:31:17 +00:00
Joe Fernandez
d6bba15c03
am e33b63fe: am 9a05dee5: am e70cb874: am c59d1d78: Merge "docs: studio basics typo" into lmp-docs automerge: 72268ad
...
* commit 'e33b63feecf6dc76db716c8064f5a21c751b81d7':
docs: studio basics typo
2014-12-16 02:23:24 +00:00
Luan Nguyen
56102be892
am 443e57df: am 556ce7f1: am 47efca78: am a854ddfd: docs: Add two new general functionality requirements automerge: bb01880
...
* commit '443e57df26077652d35b4e294e4a5ed3cd6030b3':
docs: Add two new general functionality requirements
2014-12-16 02:23:17 +00:00
Sarah Maddox
48f9c8e48c
am aaa37da8: am a158abe4: Merge "docs: Updates lesson 1 of location API training: Get last-known location." into lmp-docs
...
automerge: 8f0f627
* commit '8f0f627e0e76918a57941c71ad49ea6758f68886':
docs: Updates lesson 1 of location API training: Get last-known location.
2014-12-16 01:39:00 +00:00
smain@google.com
9af05a6899
am 16d9a037: am 68e6819b: brute force improve suggestions for sdk download
...
automerge: c21b455
* commit 'c21b4553cbdeb8286a49108ec6059871ad81eba2':
brute force improve suggestions for sdk download
2014-12-16 01:37:42 +00:00
Rich Slogar
579110887d
am 895d1694: am 6b8756c3: docs: studio 1.0.1 revision update
...
automerge: b2a9bd5
* commit 'b2a9bd5e9b1984b8aeda17b0c1477e9190fc171e':
docs: studio 1.0.1 revision update
2014-12-16 01:36:40 +00:00
smain@google.com
a01e83b266
am 8bb3962b: am 8e8f29e3: Merge "fix distribute nav styles. they were not highlighted correctly." into lmp-docs
...
automerge: 63ed5e1
* commit '63ed5e1b7736006f8d4ac5b4e60c453e2b26ad81':
fix distribute nav styles. they were not highlighted correctly.
2014-12-16 01:35:19 +00:00
Joe Fernandez
519fbf3ae7
am 4234fca6: am 044f3947: Merge "docs: uiautomator blog link removal" into lmp-docs
...
automerge: d799f75
* commit 'd799f75c6b3adb088372f73967aee6362407e59b':
docs: uiautomator blog link removal
2014-12-16 01:33:56 +00:00
Joe Fernandez
9a05dee5ec
am e70cb874: am c59d1d78: Merge "docs: studio basics typo" into lmp-docs
...
automerge: 72268ad
* commit '72268ad3d4ecdeaee47ad8de0ec372bb834255c7':
docs: studio basics typo
2014-12-16 01:32:49 +00:00
Luan Nguyen
556ce7f145
am 47efca78: am a854ddfd: docs: Add two new general functionality requirements
...
automerge: bb01880
* commit 'bb01880e6216c360a4732b02a1becb32520fcf5e':
docs: Add two new general functionality requirements
2014-12-16 01:30:17 +00:00
Rich Slogar
88b276970e
docs: studio device emulator updates
...
Change-Id: If11f5c5cd1c3b990980d83980cdb324700289a6f
On branch studio-device-emulator-updates
modified: docs/html/tools/devices/emulator.jd
2014-12-15 14:39:25 -08:00
Sarah Maddox
a158abe454
Merge "docs: Updates lesson 1 of location API training: Get last-known location." into lmp-docs
2014-12-15 20:42:40 +00:00
Rich Slogar
c819d3df86
docs: studio revision 21 update
...
Change-Id: I61a6fa657aae08760a73816d5ad5536957a3be20
2014-12-15 10:46:18 -08:00
smain@google.com
68e6819bd0
brute force improve suggestions for sdk download
...
Change-Id: I4698058a12472a65e67cadc3d0e3dd1ffed1b384
2014-12-15 10:00:59 -08:00
smain@google.com
0baa12cee3
Merge "followup fix to conflict resolution in Change-Id: I9cc71d672141c23c0c2ed0a73d3e80aac10f3eb6"
2014-12-15 15:56:55 +00:00
smain@google.com
5d0766a80e
followup fix to conflict resolution in Change-Id: I9cc71d672141c23c0c2ed0a73d3e80aac10f3eb6
...
Change-Id: I5796348197732f6c9e72fcbdbca5fcd4934f8994
2014-12-15 07:39:52 -08:00
Sarah Maddox
65dc25da3f
docs: Updates lesson 1 of location API training: Get last-known location.
...
Uses GoogleApiClient to connect to Play services.
Uses the latest Fused Location Provider API.
Updates the entire tutorial and code sample for clarity and correctness.
Bug: 17109822
Change-Id: I759a184a72d50702030b898a5f2e240cd3bdf4be
2014-12-15 16:55:36 +11:00
Rich Slogar
6b8756c397
docs: studio 1.0.1 revision update
...
Change-Id: If9ef9ba986ae02463bec8040924a06ab0ccc8124
2014-12-12 21:19:02 -08:00
smain@google.com
8e8f29e342
Merge "fix distribute nav styles. they were not highlighted correctly." into lmp-docs
2014-12-13 00:55:32 +00:00
Joe Fernandez
044f3947bc
Merge "docs: uiautomator blog link removal" into lmp-docs
2014-12-13 00:20:35 +00:00
Joe Fernandez
c59d1d780b
Merge "docs: studio basics typo" into lmp-docs
2014-12-13 00:03:10 +00:00
Rich Slogar
7789f4dbee
docs: studio basics typo
...
Change-Id: I3e20deb2abc8513266cc2182d9be1ae809bbeae0
2014-12-12 15:56:46 -08:00
Luan Nguyen
a854ddfd79
docs: Add two new general functionality requirements
...
Bug: 18733124
Change-Id: Ia4b1e74980cbb645d1ab0b61ec56f06a3704fd3b
2014-12-12 15:10:19 -08:00
Rich Slogar
50ff944c02
docs: help-adt link updates
...
Change-Id: I60fdea090d330a90ebf12b954fa312dbd49cec29
2014-12-12 09:59:02 -08:00
Narayan Kamath
93bb5419aa
Merge "Remove references to apache-http from various documents."
2014-12-12 14:56:44 +00:00
Narayan Kamath
56eb989791
Remove references to apache-http from various documents.
...
Most of them are pointless links to a "text/plain" constant which are
far clearer when inlined with the relevant text.
Change-Id: Iaed51b4548cb2836741106dc19c9cf500c205d32
2014-12-12 14:55:18 +00:00
David Friedman
2b7b23e9b4
am 99385aa9: am e84bf9fd: am d0d76540: am c82392df: am 1ab615b3: Merge "Adds link to related video." into lmp-docs automerge: e90a170
...
* commit '99385aa9928b1e860b0baefa73374018809c94ad':
Adds link to related video.
2014-12-12 04:26:16 +00:00
Joe Fernandez
80cfbedbfd
am 6ea9db4b: am 81779694: am c9014b6d: am ea500a3a: am 0aa23445: Merge "docs: studio basics haxm updates" into lmp-docs automerge: a878256
...
* commit '6ea9db4b6434b9f2c1059e7c4a050ea4245a7342':
docs: studio basics haxm updates
2014-12-12 04:25:59 +00:00
Ricardo Cervera
dd4b92b3fa
am c0276ebd: am af7070e6: am 64d97cb2: am 6621a4f6: am 9fe34d90: Merge "docs: Fixes to watch faces docs." into lmp-docs automerge: 575c8c9
...
* commit 'c0276ebd93554b9c3bfde2587b00ca79afa6ed05':
docs: Fixes to watch faces docs.
2014-12-12 04:25:54 +00:00
Rich Slogar
bde459f33e
am cc46ad8d: am 0564cee3: am b490f297: am 5c853c26: am d35216ad: Merge "docs: studio bundle update" into lmp-docs automerge: 51f1c26
...
* commit 'cc46ad8d66d71867ff59bcd73b8e0861ef1744c5':
docs: studio bundle update
2014-12-12 04:25:49 +00:00
David Friedman
99385aa992
am e84bf9fd: am d0d76540: am c82392df: am 1ab615b3: Merge "Adds link to related video." into lmp-docs
...
automerge: e90a170
* commit 'e90a170f67f91d9b0166ac4f0de07f63207b1bce':
Adds link to related video.
2014-12-12 04:23:07 +00:00
Joe Fernandez
e5624ae02b
am 11fc651a: am 07877955: am 5c518b7f: am b32987ec: am c3daed96: Merge "docs: platform updates for api 21" into lmp-docs automerge: cc08e61
...
* commit '11fc651aefbcdebc646f347e4981204d3ef7b0a7':
docs: platform updates for api 21
2014-12-12 04:21:22 +00:00
Joe Fernandez
3e42bb70e4
am 4cb6d10d: am e3bac3bc: am b64545c8: am 378c71a3: am 235e4be4: Merge "docs: sdk tools 24.0.1 revisions" into lmp-docs automerge: 11bccb1
...
* commit '4cb6d10d5e7d7b21a1d9ee2d0b69c7a34f86503c':
docs: sdk tools 24.0.1 revisions
2014-12-12 04:21:17 +00:00
Andrew Solovay
117a8f8af0
am d96ed254: am 13e0a650: am a97053fd: am f43c057c: am c7ad6e91: docs: Added info about managed profiles to "Android 5.0 Changes" automerge: fe96791
...
* commit 'd96ed254db9c9eea778bdc8fee2a983d3a38acae':
docs: Added info about managed profiles to "Android 5.0 Changes"
2014-12-12 04:21:12 +00:00
Joe Fernandez
6ea9db4b64
am 81779694: am c9014b6d: am ea500a3a: am 0aa23445: Merge "docs: studio basics haxm updates" into lmp-docs
...
automerge: a878256
* commit 'a878256b59e1766ce918257dbfe343b0d3d0ec2d':
docs: studio basics haxm updates
2014-12-12 04:19:03 +00:00
Ricardo Cervera
c0276ebd93
am af7070e6: am 64d97cb2: am 6621a4f6: am 9fe34d90: Merge "docs: Fixes to watch faces docs." into lmp-docs
...
automerge: 575c8c9
* commit '575c8c9fcdc2ee8ed614ac9b6a4992fffe8ccea4':
docs: Fixes to watch faces docs.
2014-12-12 04:17:41 +00:00
Rich Slogar
cc46ad8d66
am 0564cee3: am b490f297: am 5c853c26: am d35216ad: Merge "docs: studio bundle update" into lmp-docs
...
automerge: 51f1c26
* commit '51f1c26b5b4b2c514fd5a4ca11de98542ccd4166':
docs: studio bundle update
2014-12-12 04:16:30 +00:00
Joe Fernandez
11fc651aef
am 07877955: am 5c518b7f: am b32987ec: am c3daed96: Merge "docs: platform updates for api 21" into lmp-docs
...
automerge: cc08e61
* commit 'cc08e619d6a946b58b2aae857e3190b5996c07b8':
docs: platform updates for api 21
2014-12-12 04:14:43 +00:00
Joe Fernandez
4cb6d10d5e
am e3bac3bc: am b64545c8: am 378c71a3: am 235e4be4: Merge "docs: sdk tools 24.0.1 revisions" into lmp-docs
...
automerge: 11bccb1
* commit '11bccb1ebe457bc3cca582320d13a459920425d9':
docs: sdk tools 24.0.1 revisions
2014-12-12 04:13:20 +00:00
Andrew Solovay
d96ed254db
am 13e0a650: am a97053fd: am f43c057c: am c7ad6e91: docs: Added info about managed profiles to "Android 5.0 Changes"
...
automerge: fe96791
* commit 'fe967912faf8ddf79d9eab794c4a2417758b716d':
docs: Added info about managed profiles to "Android 5.0 Changes"
2014-12-12 04:11:53 +00:00
