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
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
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
984972fadc
am 9a6d1d9f: am c0f96532: am 8cd0bb2d: Merge "add helpouts widget to wave 3 pages" into lmp-docs automerge: e04a9fc automerge: bac113b
...
automerge: c73a65d
* commit 'c73a65d61892542ece0dd9b95000048517f36c02':
add helpouts widget to wave 3 pages
2014-12-11 10:21:47 +00:00
Luan Nguyen
671dd81eeb
am 25964a85: am 7e1b348a: am 4221d7e4: docs: Fix link for moved Android Studio index. automerge: 75ec24e automerge: 8470943
...
automerge: f5b8651
* commit 'f5b865101d6f47aa5ef49cbd6b121d897116356c':
docs: Fix link for moved Android Studio index.
2014-12-11 10:20:17 +00: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
* commit 'bac113bbcbe7780ca658f09019e5118ec851cd07':
add helpouts widget to wave 3 pages
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
* commit '847094397ebac9ab2c5bb7e11844fd2b533bd209':
docs: Fix link for moved Android Studio index.
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
* commit 'e04a9fcc2edc4b2527c8233e16f823cec6fb58cc':
add helpouts widget to wave 3 pages
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
* commit '75ec24e26900fa6e0def1f5e946be41614d8e520':
docs: Fix link for moved Android Studio index.
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
Joe Fernandez
4c7ec3d469
am e4e1687d: am 5a64a475: am 9727d191: am 534ae165: am 3454091d: Merge "docs:studio basic links" into lmp-docs automerge: 4ded0a1
...
* commit 'e4e1687d73870a3ea05a26fb3a3ec598b42f053d':
docs:studio basic links
2014-12-10 22:00:11 +00:00
Luan Nguyen
12a44ca6f4
am 1032dac1: am 596d4e72: am c9e5c5f7: am 8a65df39: am 258da738: docs: Fix text on step 5 of the opt-in steps automerge: ee501ed
...
* commit '1032dac1f80cb46b796ab4fe31eb1139cabdd8c9':
docs: Fix text on step 5 of the opt-in steps
2014-12-10 22:00:01 +00:00
Joe Fernandez
60648a6faf
am c6ff4552: 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
...
* commit 'c6ff45522b11fd0e2d31996f532039150773e7fd':
docs: Update wording on Packaging requirement description. Add Watch Face requirement.
2014-12-10 21:58:33 +00:00
Ricardo Cervera
c07bbcb37c
am fc1e25f3: am d56b7a39: am 504e213f: am ea15366a: am 26e21055: Merge "docs: Creating Custom Watch Faces training class." into lmp-docs automerge: a41a241
...
* commit 'fc1e25f30deac9f148add51875f92ef4ff473527':
docs: Creating Custom Watch Faces training class.
2014-12-10 21:58:28 +00:00
Ricardo Cervera
b2edc00747
am b8217ea7: am 2a34e719: am c0d08616: am c6361d8d: Merge "docs: Add details to Packaging Wearable apps." into lmp-dev automerge: 7061697
...
* commit 'b8217ea7f0bc217c0c902657521dc51fd5305a65':
docs: Add details to Packaging Wearable apps.
2014-12-10 21:58:22 +00:00
Ricardo Cervera
953cf63418
am 85cc4090: am 0342d70e: am f94ee2c1: am ec656c51: am 0024f12d: Merge "docs: Design guidelines for watch faces draft." into lmp-docs automerge: 1b46c2c
...
* commit '85cc40907648070c351b66f26163c8aaf3289073':
docs: Design guidelines for watch faces draft.
2014-12-10 21:58:17 +00:00
smain@google.com
2c3c4b168b
am 835ad716: 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 l
...
* commit '835ad71635638f1154a887464758fe81457da327':
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.
2014-12-10 21:58:06 +00:00
Joe Fernandez
54ebc61eff
am b721e45a: am 913a683d: am f8527c7f: am c3ae2596: am 1e824284: Merge "docs: Add Distributing to Android Wear doc" into lmp-docs automerge: caad620
...
* commit 'b721e45a43b5c8797cea90cf6f908d109689f865':
docs: Add Distributing to Android Wear doc
2014-12-10 21:58:02 +00:00
