9624 Commits

Author SHA1 Message Date
Eric Gilmore
6c8b80acbb Merge "Removing three obsolete lessons from TOC, which in turn removes them from building-userinfo.jd when built." into lmp-docs 2015-01-09 22:42:47 +00:00
Eric Gilmore
46f751864b Adding Android Fundamentals video.
Bug: 18820337
Change-Id: I758de61902f375d02219414999ea7833b5787474
2015-01-09 13:22:59 -08:00
Joe Fernandez
2e356e4c15 am 04b30fa0: am ec5f5934: am 97b7b863: am d385640f: am 491a8257: docs: Update Dashboard for January 2015 automerge: 0e13957
* commit '04b30fa00b5ae9c05c307dbfa2ba7d8028402999':
  docs: Update Dashboard for January 2015
2015-01-08 00:16:28 +00:00
Joe Fernandez
04b30fa00b am ec5f5934: am 97b7b863: am d385640f: am 491a8257: docs: Update Dashboard for January 2015 automerge: 0e13957
* commit 'ec5f5934153557e85c1a001e713b963b79d18388':
  docs: Update Dashboard for January 2015
2015-01-08 00:03:52 +00:00
Joe Fernandez
97b7b8637b am d385640f: am 491a8257: docs: Update Dashboard for January 2015
automerge: 0e13957

* commit '0e13957a4deab3a90492d9ae2f6d35d3b5c1773e':
  docs: Update Dashboard for January 2015
2015-01-07 23:51:33 +00:00
Rich Slogar
3bb85fb8c9 docs: build link update
Change-Id: I06a3e7fc914dff829bd1d210675daf5f99ba68e0
2015-01-07 13:54:30 -08:00
Eric Gilmore
1b554a3183 Removing three obsolete lessons from TOC, which in turn removes them
from building-userinfo.jd when built.

Change-Id: If5cfbfadadb202946267ff83f665f8414875bd8c
2015-01-07 13:35:45 -08:00
Quddus Chong
8b0250b820 am 2c9d203c: am dc1db5bf: am bc8b0541: am 96f11258: am dc649c8d: am 8a195822: Merge "docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug: 18759727" into lmp-docs
* commit '2c9d203c4a167344bcac8dabf31eae27489214b0':
  docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug: 18759727
2015-01-07 10:25:53 +00:00
Quddus Chong
d3d707ed92 am 585be9c0: am 0178c0d7: am 7628b728: am decac431: am 14694d6e: am 3bdc68ed: Merge "docs: Updated GMS version numbering to be consistent with blog post. bug: 18718181" into lmp-docs
* commit '585be9c01455a44f467c11aaf0150b4e7393ee59':
  docs: Updated GMS version numbering to be consistent with blog post. bug: 18718181
2015-01-07 10:25:48 +00:00
Quddus Chong
50a0796e69 am 1f03d4ba: am fbb27960: am 4d39cfa4: am a63d2b83: am b55e2bf0: Merge "docs: Updated the description of the enhanced camera APIs in L. bug: 18142680" into lmp-docs
automerge: 159b409

* commit '159b409121096e28d8735074122c5858b6ed1093':
  docs: Updated the description of the enhanced camera APIs in L. bug: 18142680
2015-01-07 10:24:15 +00:00
Joe Fernandez
de60e6d00a am 912b2574: am 52aec00c: am ca14e6c8: am f50be1fc: am 91c35ce1: Merge "docs: studio index typo" into lmp-docs
automerge: 87df2ea

* commit '87df2ea08fbb9360910c006ca920c43e5165b604':
  docs: studio index typo
2015-01-07 10:22:55 +00:00
Joe Fernandez
3f4242b89a am ea765e7d: am 76094382: am c6fe54ed: am 62c3abe7: am acb35e19: Merge "docs: studio bundle checksum update" into lmp-docs
automerge: dbe3aba

* commit 'dbe3aba4a54bca629b727d81906516a22eee3c5c':
  docs: studio bundle checksum update
2015-01-07 10:21:24 +00:00
Joe Fernandez
597da2488a am 909f840c: am 4c5b5cff: Merge "resolved conflicts for merge of ea0137ef to lmp-mr1-dev" into lmp-mr1-dev
automerge: b1c7f02

* commit 'b1c7f0215bc36b5f27d226d1fc085be99201fe7b':
  docs: Checklist for TV Apps
2015-01-07 10:19:59 +00:00
Quddus Chong
2c9d203c4a am dc1db5bf: am bc8b0541: am 96f11258: am dc649c8d: am 8a195822: Merge "docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug: 18759727" into lmp-docs
* commit 'dc1db5bf5413bc432c77910d11c15b0442b27ace':
  docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug: 18759727
2015-01-07 10:17:45 +00:00
Quddus Chong
585be9c014 am 0178c0d7: am 7628b728: am decac431: am 14694d6e: am 3bdc68ed: Merge "docs: Updated GMS version numbering to be consistent with blog post. bug: 18718181" into lmp-docs
* commit '0178c0d782fb19cc6235ef6722251a441734345e':
  docs: Updated GMS version numbering to be consistent with blog post. bug: 18718181
2015-01-07 10:17:39 +00:00
Quddus Chong
159b409121 am 1f03d4ba: am fbb27960: am 4d39cfa4: am a63d2b83: am b55e2bf0: Merge "docs: Updated the description of the enhanced camera APIs in L. bug: 18142680" into lmp-docs
* commit '1f03d4ba753c9c75a430703e535f4c0cd9daef67':
  docs: Updated the description of the enhanced camera APIs in L. bug: 18142680
2015-01-07 10:17:33 +00:00
Joe Fernandez
87df2ea08f am 912b2574: am 52aec00c: am ca14e6c8: am f50be1fc: am 91c35ce1: Merge "docs: studio index typo" into lmp-docs
* commit '912b25743d241caa150fd56aa15d1a6b9c59e428':
  docs: studio index typo
2015-01-07 10:17:26 +00:00
Joe Fernandez
dbe3aba4a5 am ea765e7d: am 76094382: am c6fe54ed: am 62c3abe7: am acb35e19: Merge "docs: studio bundle checksum update" into lmp-docs
* commit 'ea765e7d803bd85c81c87611f76c4f176045c0f1':
  docs: studio bundle checksum update
2015-01-07 10:17:20 +00:00
Joe Fernandez
b1c7f0215b am 909f840c: am 4c5b5cff: Merge "resolved conflicts for merge of ea0137ef to lmp-mr1-dev" into lmp-mr1-dev
* commit '909f840cdaf4f172b29c2c56921c4619165c4820':
  docs: Checklist for TV Apps
2015-01-07 10:17:13 +00:00
Quddus Chong
bc8b0541d7 am 96f11258: am dc649c8d: am 8a195822: Merge "docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug: 18759727" into lmp-docs
* commit '96f11258ab19962c93b615c00b387bdc05c0d75b':
  docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug: 18759727
2015-01-07 09:23:10 +00:00
Quddus Chong
7628b72826 am decac431: am 14694d6e: am 3bdc68ed: Merge "docs: Updated GMS version numbering to be consistent with blog post. bug: 18718181" into lmp-docs
* commit 'decac4319172c5f1c618de93dcb2a15678c3e214':
  docs: Updated GMS version numbering to be consistent with blog post. bug: 18718181
2015-01-07 09:23:07 +00:00
Quddus Chong
fbb2796079 am 4d39cfa4: am a63d2b83: am b55e2bf0: Merge "docs: Updated the description of the enhanced camera APIs in L. bug: 18142680" into lmp-docs
* commit '4d39cfa415f1c391a94b001319b8d1c7b02b61c2':
  docs: Updated the description of the enhanced camera APIs in L. bug: 18142680
2015-01-07 09:23:02 +00:00
Joe Fernandez
52aec00cb4 am ca14e6c8: am f50be1fc: am 91c35ce1: Merge "docs: studio index typo" into lmp-docs
* commit 'ca14e6c8326136686d3de796f1fcd7eb2b5aebe3':
  docs: studio index typo
2015-01-07 09:22:58 +00:00
Joe Fernandez
76094382cf am c6fe54ed: am 62c3abe7: am acb35e19: Merge "docs: studio bundle checksum update" into lmp-docs
* commit 'c6fe54ed869d270533f6a3cf6ddea1e10d83afcc':
  docs: studio bundle checksum update
2015-01-07 09:22:53 +00:00
Joe Fernandez
491a8257f4 docs: Update Dashboard for January 2015
Change-Id: I20b2b2e22199db64367d5ed99b751353c3add07b
2015-01-07 00:31:45 -08:00
Scott Rowe
188a8774c9 resolved conflicts for merge of ea0137ef to lmp-mr1-dev
Change-Id: If0a38ebe4e72ec6c1a3683fab1302ee0fdfe4214
2015-01-06 19:30:11 -08:00
Ricardo Cervera
25bb2daec6 am 641353b6: am 85e0e70d: am 58872406: am a9a51433: am f211b625: am fa6fb0da: docs: Minor fixes to Watch Faces design guidelines.
* commit '641353b6c28708ec8a5e1eb4143138e5b3e4674b':
  docs: Minor fixes to Watch Faces design guidelines.
2015-01-07 00:57:14 +00:00
Ricardo Cervera
c5a1c1363c resolved conflicts for merge of 6302a72a to master
Change-Id: I3adbbb983a2d7b0b85d3de0b14cbb2619aa711dd
2015-01-06 16:31:37 -08:00
Ricardo Cervera
641353b6c2 am 85e0e70d: am 58872406: am a9a51433: am f211b625: am fa6fb0da: docs: Minor fixes to Watch Faces design guidelines.
* commit '85e0e70dfa0deeda303a17da2d6d3981028af06f':
  docs: Minor fixes to Watch Faces design guidelines.
2015-01-06 22:57:10 +00:00
Sarah Maddox
1b8a5fb594 am efd72a48: am f22bca34: am 7d9309b6: am 029acc8e: am ab515931: Merge "docs: Fixes typo on Play services page for Maps." into lmp-docs
automerge: 7aa9d75

* commit '7aa9d752c8cb5cfb9eeeeec23f53d1ad8ea271c2':
  docs: Fixes typo on Play services page for Maps.
2015-01-06 22:47:29 +00:00
Joe Fernandez
f4e13642c3 am 952ebe3f: am 64d74fbf: am 69434df3: am 180bd6be: am 76db15a8: docs: fix problem with TOC after Japanese pages merge
automerge: 88f10a8f

* commit '88f10a8f8ef616676dbf7f0ef68df32a8b75eea8':
  docs: fix problem with TOC after Japanese pages merge
2015-01-06 22:45:54 +00:00
David Friedman
a4a325350c am 859e176b: am aed8152d: am 2d179c89: am 919ecb22: am 58a5e3db: Merge "Android TV initial (time-sensitive) localization release for Japanese partners. Bug: 18527238 Change-Id: Id933695738a07aa0a1c02783e022dd8b98bbf98e" into lmp-docs
automerge: b64dea3

* commit 'b64dea3607ee12b3fd0e164b5c5fc90791bcdccd':
  Android TV initial (time-sensitive) localization release for Japanese partners. Bug: 18527238 Change-Id: Id933695738a07aa0a1c02783e022dd8b98bbf98e
2015-01-06 22:44:32 +00:00
Joe Fernandez
cf973b13a9 am 9ebb780c: am 750c0385: am 214e6867: am c27d5fd6: am 7cec35ef: Merge "docs: b/18122848 [DAC] Android TV - Recommendation card" into lmp-docs
automerge: 698f155

* commit '698f1557ff32c38b76891787050c64c2e01fd794':
  docs: b/18122848 [DAC] Android TV - Recommendation card
2015-01-06 22:41:51 +00:00
Ricardo Cervera
58872406a7 am a9a51433: am f211b625: am fa6fb0da: docs: Minor fixes to Watch Faces design guidelines.
* commit 'a9a514331ce33dde91fbcc791fdc523b74a4ffb4':
  docs: Minor fixes to Watch Faces design guidelines.
2015-01-06 22:41:03 +00:00
Joe Fernandez
d03afd4e57 am 633db0ee: am c4429f1f: am 001f6f54: am 66fefd0c: am a9a36ab2: Merge "docs: plugin link name update" into lmp-docs
automerge: 60906b5

* commit '60906b55ba63f24f94c2df0f6c856aad977d3213':
  docs: plugin link name update
2015-01-06 22:39:58 +00:00
Scott Rowe
5d1a4cf68b am dfc950b4: am aa7c1f68: am 13d31b0a: am d7d1411a: am e2b44f86: docs: Making TV Apps Searchable - new training
automerge: d35c1d3

* commit 'd35c1d3f47102a836d97121cb5c7f921f5022edf':
  docs: Making TV Apps Searchable - new training
2015-01-06 22:38:43 +00:00
Ricardo Cervera
6302a72a8d am 934c8ddc: am ebc28729: am e7d1db56: am d69238ef: am 4bb503cf: docs: Minor fixes in Android Studio pages.
* commit '934c8ddc207133cc26eea9ce10d2079f2d6ff3ea':
  docs: Minor fixes in Android Studio pages.
2015-01-06 22:36:16 +00:00
Sarah Maddox
7aa9d752c8 am efd72a48: am f22bca34: am 7d9309b6: am 029acc8e: am ab515931: Merge "docs: Fixes typo on Play services page for Maps." into lmp-docs
* commit 'efd72a4845a976aac5f9a8a464a1ee6fdbcec28a':
  docs: Fixes typo on Play services page for Maps.
2015-01-06 22:36:05 +00:00
Joe Fernandez
88f10a8f8e am 952ebe3f: am 64d74fbf: am 69434df3: am 180bd6be: am 76db15a8: docs: fix problem with TOC after Japanese pages merge
* commit '952ebe3fac284d4602aba3e36db80c407f6bc476':
  docs: fix problem with TOC after Japanese pages merge
2015-01-06 22:35:59 +00:00
David Friedman
b64dea3607 am 859e176b: am aed8152d: am 2d179c89: am 919ecb22: am 58a5e3db: Merge "Android TV initial (time-sensitive) localization release for Japanese partners. Bug: 18527238 Change-Id: Id933695738a07aa0a1c02783e022dd8b98bbf98e" into lmp-docs
* commit '859e176bfeb36cfafc1d8ed0a8748aefa2cf1982':
  Android TV initial (time-sensitive) localization release for Japanese partners. Bug: 18527238 Change-Id: Id933695738a07aa0a1c02783e022dd8b98bbf98e
2015-01-06 22:35:54 +00:00
Joe Fernandez
698f1557ff am 9ebb780c: am 750c0385: am 214e6867: am c27d5fd6: am 7cec35ef: Merge "docs: b/18122848 [DAC] Android TV - Recommendation card" into lmp-docs
* commit '9ebb780ccb600b7528b88a4d7929243fb1205cca':
  docs: b/18122848 [DAC] Android TV - Recommendation card
2015-01-06 22:35:47 +00:00
Joe Fernandez
60906b55ba am 633db0ee: am c4429f1f: am 001f6f54: am 66fefd0c: am a9a36ab2: Merge "docs: plugin link name update" into lmp-docs
* commit '633db0ee6644d3bb1f59ea274bb05cfa305daa5c':
  docs: plugin link name update
2015-01-06 22:35:41 +00:00
Scott Rowe
d35c1d3f47 am dfc950b4: am aa7c1f68: am 13d31b0a: am d7d1411a: am e2b44f86: docs: Making TV Apps Searchable - new training
* commit 'dfc950b40d7d24c08dc56ffec5327f8da11960e7':
  docs: Making TV Apps Searchable - new training
2015-01-06 22:35:34 +00:00
Ricardo Cervera
ebc2872929 am e7d1db56: am d69238ef: am 4bb503cf: docs: Minor fixes in Android Studio pages.
* commit 'e7d1db56324e406a074bf0c44e778060b07d2322':
  docs: Minor fixes in Android Studio pages.
2015-01-06 22:22:27 +00:00
Sarah Maddox
f22bca34a0 am 7d9309b6: am 029acc8e: am ab515931: Merge "docs: Fixes typo on Play services page for Maps." into lmp-docs
* commit '7d9309b6e9e6974608b2d355c9eb1a66550801b2':
  docs: Fixes typo on Play services page for Maps.
2015-01-06 22:22:08 +00:00
Joe Fernandez
64d74fbf87 am 69434df3: am 180bd6be: am 76db15a8: docs: fix problem with TOC after Japanese pages merge
* commit '69434df395798a725072424782f79daaa23aae14':
  docs: fix problem with TOC after Japanese pages merge
2015-01-06 22:21:58 +00:00
David Friedman
aed8152d86 am 2d179c89: am 919ecb22: am 58a5e3db: Merge "Android TV initial (time-sensitive) localization release for Japanese partners. Bug: 18527238 Change-Id: Id933695738a07aa0a1c02783e022dd8b98bbf98e" into lmp-docs
* commit '2d179c899a59a2001a665ca6c3725832aced648c':
  Android TV initial (time-sensitive) localization release for Japanese partners. Bug: 18527238 Change-Id: Id933695738a07aa0a1c02783e022dd8b98bbf98e
2015-01-06 22:21:54 +00:00
Joe Fernandez
750c038560 am 214e6867: am c27d5fd6: am 7cec35ef: Merge "docs: b/18122848 [DAC] Android TV - Recommendation card" into lmp-docs
* commit '214e6867c5339468a960e8b8a20c535c99eb9e57':
  docs: b/18122848 [DAC] Android TV - Recommendation card
2015-01-06 22:21:47 +00:00
Joe Fernandez
c4429f1fac am 001f6f54: am 66fefd0c: am a9a36ab2: Merge "docs: plugin link name update" into lmp-docs
* commit '001f6f5451a71da328c3e05b4da1ad3bf24ad613':
  docs: plugin link name update
2015-01-06 22:21:43 +00:00
Scott Rowe
aa7c1f6845 am 13d31b0a: am d7d1411a: am e2b44f86: docs: Making TV Apps Searchable - new training
* commit '13d31b0a40dd58d61e8a6ad82c1de165792b95e4':
  docs: Making TV Apps Searchable - new training
2015-01-06 22:21:38 +00:00