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
Ricardo Cervera
1e667f650b
am b33c8fb4: am 600224c9: am 730a52d0: am eb09f898: am d412b9ab: Merge "docs: Add new classes to Wearable UI library" into lmp-docs automerge: 768d97d
...
* commit 'b33c8fb4b528c9d80e88a0283812ab4dc76de911':
docs: Add new classes to Wearable UI library
2014-12-10 21:57:57 +00:00
Ricardo Cervera
55338ad207
am 9c6e82e7: am 45ea5690: am 5edaf136: am be80b984: am 0d8f1417: Merge "docs: Add links to wearable support zip for ADT" into lmp-docs automerge: 739d0a8c
...
* commit '9c6e82e70e9ac2aecd369ee00fadb162b29d5456':
docs: Add links to wearable support zip for ADT
2014-12-10 21:57:53 +00:00
Quddus Chong
36e228070a
am d7100111: 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
...
* commit 'd7100111514560a73fe5032f23e59c9e12b49aa1':
docs: Updated GMS highlights for v6.5 (Nacho) to reflect removal of LocationClient, PlusClient, and ActivityRecognitionClient.
2014-12-10 21:57:45 +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
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
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
Luan Nguyen
258da73846
docs: Fix text on step 5 of the opt-in steps
...
Bug: 18702823
Change-Id: I294eb017592e896217d7eeea024aa32b9f4f1511
2014-12-10 10:37:43 -08:00
Ricardo Cervera
3ccdac411c
am 0318a228: am 614889aa: am 4a6bafcb: am 12a24dc9: am 47fa6355: am 5155840b: Merge "docs: Adding links to material design videos" into lmp-docs
...
* commit '0318a2281d08e7988cd66ad6c1ef7cd5385c2a15':
docs: Adding links to material design videos
2014-12-10 17:44:31 +00:00
smain@google.com
848b1c2201
am b1d41255: am 92b6011d: am 9ecc18e2: am 4267450e: am 780a2231: am 2023bec7: revise ADT migration message b/18668828 and fix broken link
...
* commit 'b1d41255540256136b058726e0e3efb0439e713f':
revise ADT migration message b/18668828 and fix broken link
2014-12-10 17:42:54 +00:00
smain@google.com
b953e28e89
resolved conflicts for merge of cf8a8019 to master
...
Change-Id: I7de213adcad766d113c47ae88d8494445c3036f7
2014-12-10 09:40:09 -08:00
Rich Slogar
f988310cd5
am 05672d36: am 6b07b40d: am 00d635c0: am fbbab546: am d3d4fe4d: am 01ab09c2: docs:studio basics images updates
...
* commit '05672d36fe040cc3e01eaf5914b878f03c059e7b':
docs:studio basics images updates
2014-12-10 17:35:06 +00:00
Joe Fernandez
349d5f028e
am 4ddf70db: am 55677d8a: am 33a0828e: am 2a83bc2b: am 4c3b3324: am f4814b87: docs: Change Eclipse deprecation language on sdk/index.html page
...
* commit '4ddf70db557cceaf8b19140026844ca9bdd9de00':
docs: Change Eclipse deprecation language on sdk/index.html page
2014-12-10 17:35:01 +00:00
Nick Kralevich
d5180176cb
resolved conflicts for merge of ef7708f8 to master
...
Change-Id: I9cc71d672141c23c0c2ed0a73d3e80aac10f3eb6
2014-12-10 08:36:37 -08:00
Joe Fernandez
17cf77898a
am 5ff08052: am dfd05f0a: am 1832978c: Merge "docs: Update wording on Packaging requirement description. Add Watch Face requirement." into lmp-docs
...
* commit '5ff0805238787f938bf5bcadba46ac8f92e8d440':
docs: Update wording on Packaging requirement description. Add Watch Face requirement.
2014-12-10 05:57:19 +00:00
Ricardo Cervera
d56b7a39e1
am 504e213f: am ea15366a: am 26e21055: Merge "docs: Creating Custom Watch Faces training class." into lmp-docs
...
* commit '504e213fd514f7210eaa95df48620c26c0382487':
docs: Creating Custom Watch Faces training class.
2014-12-10 05:46:39 +00:00
Ricardo Cervera
2a34e71947
am c0d08616: am c6361d8d: Merge "docs: Add details to Packaging Wearable apps." into lmp-dev
...
* commit 'c0d08616f2280d7c7359bf27e33c0c012a906803':
docs: Add details to Packaging Wearable apps.
2014-12-10 05:46:34 +00:00
Joe Fernandez
dfd05f0a86
am 1832978c: Merge "docs: Update wording on Packaging requirement description. Add Watch Face requirement." into lmp-docs
...
* commit '1832978cf6355515016139e453ced187f4b4e29d':
docs: Update wording on Packaging requirement description. Add Watch Face requirement.
2014-12-10 05:42:56 +00:00
Ricardo Cervera
900efcc91c
docs: Add details to Packaging Wearable apps.
...
Bug: 17943949
(cherry picked from commit 07c9c63e3d
2014-12-10 05:36:09 +00:00
Joe Fernandez
1832978cf6
Merge "docs: Update wording on Packaging requirement description. Add Watch Face requirement." into lmp-docs
2014-12-10 05:35:22 +00:00
Ricardo Cervera
0342d70e4e
am f94ee2c1: am ec656c51: am 0024f12d: Merge "docs: Design guidelines for watch faces draft." into lmp-docs
...
* commit 'f94ee2c10ce168f6eef39cc25dd663bb8b79eac9':
docs: Design guidelines for watch faces draft.
2014-12-10 05:34:57 +00:00
Ricardo Cervera
ea15366ae3
am 26e21055: Merge "docs: Creating Custom Watch Faces training class." into lmp-docs
...
* commit '26e2105575939918e362f14b854176bc54e39b44':
docs: Creating Custom Watch Faces training class.
2014-12-10 05:34:39 +00:00
Ricardo Cervera
c6361d8df2
Merge "docs: Add details to Packaging Wearable apps." into lmp-dev
2014-12-10 05:32:19 +00:00
Ricardo Cervera
26e2105575
Merge "docs: Creating Custom Watch Faces training class." into lmp-docs
2014-12-10 05:28:33 +00:00
Ricardo Cervera
7db2979684
docs: Creating Custom Watch Faces training class.
...
Bug: 18338418
Bug: 18533881
Change-Id: I71d38c73b6a76c9bec8b646967a93d60b05c639b
2014-12-09 21:26:58 -08:00
Ricardo Cervera
0024f12dec
Merge "docs: Design guidelines for watch faces draft." into lmp-docs
2014-12-10 05:12:50 +00:00
smain@google.com
5a267e72b2
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." into lmp-docs
...
* commit '5b16e21b9f1b750d66060a25fadfe35c3ebfed30':
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 03:53:26 +00:00
Joe Fernandez
913a683de9
am f8527c7f: am c3ae2596: am 1e824284: Merge "docs: Add Distributing to Android Wear doc" into lmp-docs
...
* commit 'f8527c7f82d1197a7ebaf9caf1a199165b47e353':
docs: Add Distributing to Android Wear doc
2014-12-10 03:53:22 +00:00
Ricardo Cervera
600224c958
am 730a52d0: am eb09f898: am d412b9ab: Merge "docs: Add new classes to Wearable UI library" into lmp-docs
...
* commit '730a52d0cc9c8644791b68530520460860719d1a':
docs: Add new classes to Wearable UI library
2014-12-10 03:53:18 +00:00
Ricardo Cervera
45ea56904a
am 5edaf136: am be80b984: am 0d8f1417: Merge "docs: Add links to wearable support zip for ADT" into lmp-docs
...
* commit '5edaf136c8c3b45dded99e69fad2b5f2fb3a57f2':
docs: Add links to wearable support zip for ADT
2014-12-10 03:53:14 +00:00
Quddus Chong
15e0f7fdb3
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
...
* commit 'bdb327adb3faf3604becfe0174ef90ca6ff458c2':
docs: Updated GMS highlights for v6.5 (Nacho) to reflect removal of LocationClient, PlusClient, and ActivityRecognitionClient.
2014-12-10 03:53:08 +00:00
smain@google.com
1a2308bb85
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." into lmp-docs
2014-12-10 03:28:26 +00:00
Joe Fernandez
1e82428495
Merge "docs: Add Distributing to Android Wear doc" into lmp-docs
2014-12-10 02:10:07 +00:00
smain@google.com
b2ea94146c
followup conflict fix to Change-Id: I5959958476c3edc16f9a13a06517f70be7ec32e3
...
remove ADT from Help section of nav
Change-Id: Id55e043c205b3eae4012e284cd2802daded4df68
2014-12-09 17:39:55 -08:00
smain@google.com
cf18fa6cd8
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.
Change-Id: I5e4faef8a6eb0a08eec45981a4f9436cb07a995c
2014-12-09 17:26:07 -08:00
Dmitriy Ivanov
33f6c9f45d
resolved conflicts for merge of bd5098e6 to master
...
Change-Id: I5959958476c3edc16f9a13a06517f70be7ec32e3
2014-12-09 17:22:31 -08:00
