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
6ea9db4b64
am 81779694: am c9014b6d: am ea500a3a: am 0aa23445: Merge "docs: studio basics haxm updates" into lmp-docs
...
automerge: a878256
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
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
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
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
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
2014-12-12 04:11:53 +00:00
David Friedman
e84bf9fddc
am d0d76540: am c82392df: am 1ab615b3: Merge "Adds link to related video." into lmp-docs
...
* commit 'd0d76540ae937d6773793ba053e81ee3667d0ba6':
Adds link to related video.
2014-12-11 22:21:16 +00:00
David Friedman
1ab615b3e6
Merge "Adds link to related video." into lmp-docs
2014-12-11 21:55:25 +00:00
Joe Fernandez
817796940b
am c9014b6d: am ea500a3a: am 0aa23445: Merge "docs: studio basics haxm updates" into lmp-docs
...
* commit 'c9014b6d59cae3602027a5ea373d436a7e78b71c':
docs: studio basics haxm updates
2014-12-11 20:55:53 +00:00
Ricardo Cervera
af7070e6f0
am 64d97cb2: am 6621a4f6: am 9fe34d90: Merge "docs: Fixes to watch faces docs." into lmp-docs
...
* commit '64d97cb2ad6bfd10511067f178ba8a1ccf9ba452':
docs: Fixes to watch faces docs.
2014-12-11 20:55:49 +00:00
Rich Slogar
0564cee3c7
am b490f297: am 5c853c26: am d35216ad: Merge "docs: studio bundle update" into lmp-docs
...
* commit 'b490f297101bcf31f56278d21d5f56a5e5998a58':
docs: studio bundle update
2014-12-11 20:55:45 +00:00
Joe Fernandez
07877955be
am 5c518b7f: am b32987ec: am c3daed96: Merge "docs: platform updates for api 21" into lmp-docs
...
* commit '5c518b7f01345a414cd260db7762bdb0aa73b55b':
docs: platform updates for api 21
2014-12-11 20:55:35 +00:00
Joe Fernandez
e3bac3bc8f
am b64545c8: am 378c71a3: am 235e4be4: Merge "docs: sdk tools 24.0.1 revisions" into lmp-docs
...
* commit 'b64545c83a526d17ccbce2d110a06f3789dd4ad8':
docs: sdk tools 24.0.1 revisions
2014-12-11 20:55:29 +00:00
Andrew Solovay
13e0a6505f
am a97053fd: am f43c057c: am c7ad6e91: docs: Added info about managed profiles to "Android 5.0 Changes"
...
* commit 'a97053fd0ba37feb7382fd30498a6a5e93c52a9e':
docs: Added info about managed profiles to "Android 5.0 Changes"
2014-12-11 20:55:23 +00:00
Joe Fernandez
0aa2344577
Merge "docs: studio basics haxm updates" into lmp-docs
2014-12-11 19:43:18 +00:00
Ricardo Cervera
9fe34d9037
Merge "docs: Fixes to watch faces docs." into lmp-docs
2014-12-11 19:28:41 +00:00
Rich Slogar
d35216ad36
Merge "docs: studio bundle update" into lmp-docs
2014-12-11 19:04:03 +00:00
Rich Slogar
2f8f42f897
docs: studio bundle update
...
Change-Id: I232a61ae6747b879e8a36f8e4942d6a3406c4162
2014-12-11 10:51:41 -08:00
Rich Slogar
d282ba778b
docs: studio basics haxm updates
...
Change-Id: I2c3ef0dae3a091be27f1cfef13fe385f97781492
2014-12-11 10:03:19 -08:00
Ricardo Cervera
ad69082b50
docs: Fixes to watch faces docs.
...
Bug: 18705470
Bug: 18702859
Bug: 18713266
Change-Id: I67f159f3b54a03f08aa1cd4bf3aa40eec4a34631
2014-12-11 09:17:45 -08:00
smain@google.com
c73a65d618
am 9a6d1d9f: am c0f96532: am 8cd0bb2d: Merge "add helpouts widget to wave 3 pages" into lmp-docs automerge: e04a9fc
...
automerge: bac113b
2014-12-11 03:39:57 +00:00
Luan Nguyen
f5b865101d
am 25964a85: am 7e1b348a: am 4221d7e4: docs: Fix link for moved Android Studio index. automerge: 75ec24e
...
automerge: 8470943
2014-12-11 03:38:41 +00:00
smain@google.com
9a6d1d9fba
am c0f96532: am 8cd0bb2d: Merge "add helpouts widget to wave 3 pages" into lmp-docs
...
automerge: e04a9fc
2014-12-11 02:56:17 +00:00
Luan Nguyen
25964a854a
am 7e1b348a: am 4221d7e4: docs: Fix link for moved Android Studio index.
...
automerge: 75ec24e
2014-12-11 02:54:57 +00:00
Joe Fernandez
c3daed967d
Merge "docs: platform updates for api 21" into lmp-docs
2014-12-11 00:31:54 +00:00
Joe Fernandez
235e4be4c9
Merge "docs: sdk tools 24.0.1 revisions" into lmp-docs
2014-12-11 00:27:02 +00:00
Andrew Solovay
c7ad6e9175
docs: Added info about managed profiles to "Android 5.0 Changes"
...
Also a couple of unrelated changes while the file was open.
See first comment for link to staged doc.
Change-Id: I56dd57104729dec353b0dd630715a43a73d043d3
2014-12-10 16:08:23 -08:00
smain@google.com
8cd0bb2df3
Merge "add helpouts widget to wave 3 pages" into lmp-docs
2014-12-10 23:07:38 +00:00
Luan Nguyen
4221d7e4cb
docs: Fix link for moved Android Studio index.
...
Change-Id: Ia0c4cdcf05fddd12e0e50c2b6343809f80ab5f65
2014-12-10 13:42:05 -08:00
Joe Fernandez
f9d2cd9931
am 844af56b: am efab8b6f: am bdd6aabd: am d49977d9: Merge "docs: update debug menu for debugging-studio" into lmp-docs
...
automerge: 15cfa4f
2014-12-10 20:04:31 +00:00
Joe Fernandez
e4e1687d73
am 5a64a475: am 9727d191: am 534ae165: am 3454091d: Merge "docs:studio basic links" into lmp-docs
...
automerge: 4ded0a1
* commit '4ded0a166f96da7bcb377c0573ba373b77fe596e':
docs:studio basic links
2014-12-10 19:56:05 +00:00
Joe Fernandez
844af56b85
am efab8b6f: am bdd6aabd: am d49977d9: Merge "docs: update debug menu for debugging-studio" into lmp-docs
...
* commit 'efab8b6fd50e2e4ad3adb03c4bca2bc531ae5d42':
docs: update debug menu for debugging-studio
2014-12-10 19:54:51 +00:00
Joe Fernandez
5a64a47580
am 9727d191: am 534ae165: am 3454091d: Merge "docs:studio basic links" into lmp-docs
...
* commit '9727d1910052e600ebcf417c9fe55436ecf2c9de':
docs:studio basic links
2014-12-10 19:46:37 +00:00
Luan Nguyen
1032dac1f8
am 596d4e72: am c9e5c5f7: am 8a65df39: am 258da738: docs: Fix text on step 5 of the opt-in steps
...
automerge: ee501ed
2014-12-10 19:36:26 +00:00
Joe Fernandez
d49977d967
Merge "docs: update debug menu for debugging-studio" into lmp-docs
2014-12-10 19:31:12 +00:00
Rich Slogar
7deca3c93f
docs: sdk tools 24.0.1 revisions
...
Change-Id: I872aaba5844fe7642874147b158c8119d111162d
2014-12-10 11:27:59 -08:00
Luan Nguyen
596d4e7230
am c9e5c5f7: am 8a65df39: am 258da738: docs: Fix text on step 5 of the opt-in steps
...
* commit 'c9e5c5f72a563c7b8e030a57cf586941d32006f4':
docs: Fix text on step 5 of the opt-in steps
2014-12-10 19:26:37 +00:00
Joe Fernandez
3454091dad
Merge "docs:studio basic links" into lmp-docs
2014-12-10 19:23:16 +00:00
Rich Slogar
bea1510573
docs: update debug menu for debugging-studio
...
Change-Id: I04c71104b1ac9c0e4413c518ccd41ba3e6a90f8f
2014-12-10 11:14:15 -08:00
David Friedman
65a01238fc
Adds link to related video.
...
Change-Id: I22823b0df2863c4e733d389d20440debb16c5631
2014-12-10 11:14:01 -08:00
Joe Fernandez
c6ff45522b
am 17cf7789: am 5ff08052: am dfd05f0a: am 1832978c: Merge "docs: Update wording on Packaging requirement description. Add Watch Face requirement." into lmp-docs
...
automerge: 39409f2
2014-12-10 19:03:32 +00:00
Ricardo Cervera
fc1e25f30d
am d56b7a39: am 504e213f: am ea15366a: am 26e21055: Merge "docs: Creating Custom Watch Faces training class." into lmp-docs
...
automerge: a41a241
2014-12-10 19:02:10 +00:00
Ricardo Cervera
b8217ea7f0
am 2a34e719: am c0d08616: am c6361d8d: Merge "docs: Add details to Packaging Wearable apps." into lmp-dev
...
automerge: 7061697
2014-12-10 19:00:49 +00:00
Ricardo Cervera
85cc409076
am 0342d70e: am f94ee2c1: am ec656c51: am 0024f12d: Merge "docs: Design guidelines for watch faces draft." into lmp-docs
...
automerge: 1b46c2c
2014-12-10 18:59:28 +00:00
smain@google.com
835ad71635
am 5a267e72: am 5b16e21b: am 6554bb45: am 1a2308bb: Merge "misc updates related to Android Studio. clarify a few doc titles for improved search results clarity. update "get started" page link to Android Studio, add First App link, and remove some biased language." int
...
automerge: 6c1facd
2014-12-10 18:56:52 +00:00
Joe Fernandez
b721e45a43
am 913a683d: am f8527c7f: am c3ae2596: am 1e824284: Merge "docs: Add Distributing to Android Wear doc" into lmp-docs
...
automerge: caad620
2014-12-10 18:55:29 +00:00
Ricardo Cervera
b33c8fb4b5
am 600224c9: am 730a52d0: am eb09f898: am d412b9ab: Merge "docs: Add new classes to Wearable UI library" into lmp-docs
...
automerge: 768d97d
2014-12-10 18:53:59 +00:00
Ricardo Cervera
9c6e82e70e
am 45ea5690: am 5edaf136: am be80b984: am 0d8f1417: Merge "docs: Add links to wearable support zip for ADT" into lmp-docs
...
automerge: 739d0a8c
2014-12-10 18:52:44 +00:00
Quddus Chong
d710011151
am 15e0f7fd: am bdb327ad: am c24c5797: am 09e72628: Merge "docs: Updated GMS highlights for v6.5 (Nacho) to reflect removal of LocationClient, PlusClient, and ActivityRecognitionClient." into lmp-docs
...
automerge: 20baf9e
2014-12-10 18:51:16 +00:00
