summaryrefslogtreecommitdiffstats
path: root/docs
Commit message (Collapse)AuthorAgeFilesLines
* am d9d05fe3: am 838e4aa6: Merge "docs: sdk-tools 24.3.3 updates" into ↵Rich Slogar2015-06-192-12/+43
|\ | | | | | | | | | | | | mnc-preview-docs * commit 'd9d05fe358c96e85149627d955191d1328e9924a': docs: sdk-tools 24.3.3 updates
| * am 838e4aa6: Merge "docs: sdk-tools 24.3.3 updates" into mnc-preview-docsRich Slogar2015-06-182-12/+43
| |\ | | | | | | | | | | | | * commit '838e4aa6e69f6482adfdde2e45867a36dc1db2b0': docs: sdk-tools 24.3.3 updates
| | * Merge "docs: sdk-tools 24.3.3 updates" into mnc-preview-docsRich Slogar2015-06-182-12/+43
| | |\
| | | * docs: sdk-tools 24.3.3 updatesRich Slogar2015-06-182-12/+43
| | | | | | | | | | | | | | | | Change-Id: I30267355dc17cd6451b28b2aca6d639b9af320d4
* | | | Merge "Improve documentation for keys requiring user auth." into mnc-devAlex Klyubin2015-06-171-23/+36
|\ \ \ \
| * | | | Improve documentation for keys requiring user auth.Alex Klyubin2015-06-171-23/+36
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18088752 Change-Id: I24eeb33790a74d8d81d10fcdb1eb058d47144c44
* | | | | am 93bd8134: am eae09b4a: Merge "docs: Updated Android TV landing page and ↵Quddus Chong2015-06-173-9/+44
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Live TV training to support channels. bug: 21786387" into mnc-preview-docs * commit '93bd81346de88f850f4e4002229a3119c97d8ddb': docs: Updated Android TV landing page and Live TV training to support channels. bug: 21786387
| * | | | am eae09b4a: Merge "docs: Updated Android TV landing page and Live TV ↵Quddus Chong2015-06-173-9/+44
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | training to support channels. bug: 21786387" into mnc-preview-docs * commit 'eae09b4a642bb30d5fd8ff90796e410197d71c95': docs: Updated Android TV landing page and Live TV training to support channels. bug: 21786387
| | * | | Merge "docs: Updated Android TV landing page and Live TV training to support ↵Quddus Chong2015-06-173-9/+44
| | |\ \ \ | | | |_|/ | | |/| | | | | | | channels. bug: 21786387" into mnc-preview-docs
| | | * | docs: Updated Android TV landing page and Live TV training to support channels.Quddus Chong2015-06-163-9/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 21786387 Change-Id: I343e00d30d25f46a9081af339ee4c4a2fddba149
* | | | | am 0752aa54: am 5cef09b0: Merge "docs: Update JavaDoc links for Watch Face ↵Luan Nguyen2015-06-175-52/+105
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | class." into mnc-preview-docs * commit '0752aa54a03b39e2a16e6f40e4d7cf912a29bd08': docs: Update JavaDoc links for Watch Face class.
| * | | | am 5cef09b0: Merge "docs: Update JavaDoc links for Watch Face class." into ↵Luan Nguyen2015-06-175-52/+105
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | mnc-preview-docs * commit '5cef09b07521cf14eb6a9c9dc59276b9b6482bef': docs: Update JavaDoc links for Watch Face class.
| | * | | Merge "docs: Update JavaDoc links for Watch Face class." into mnc-preview-docsLuan Nguyen2015-06-175-52/+105
| | |\ \ \
| | | * | | docs: Update JavaDoc links for Watch Face class.Luan Nguyen2015-06-125-52/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 21731309 Change-Id: I4d0899f42e3150aad399efc8d1e1e4f63dc6bc9d
* | | | | | am ce26f291: am 5980ae8f: Merge "docs: Update JavaDoc reference links for ↵Luan Nguyen2015-06-172-56/+117
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create Wearable Apps class" into mnc-preview-docs * commit 'ce26f2911361fe1da9d3f350e2785657d6d5e685': docs: Update JavaDoc reference links for Create Wearable Apps class
| * | | | | am 5980ae8f: Merge "docs: Update JavaDoc reference links for Create Wearable ↵Luan Nguyen2015-06-172-56/+117
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apps class" into mnc-preview-docs * commit '5980ae8f06d5a56a5bfc763729533d975079b801': docs: Update JavaDoc reference links for Create Wearable Apps class
| | * | | | Merge "docs: Update JavaDoc reference links for Create Wearable Apps class" ↵Luan Nguyen2015-06-172-56/+117
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | into mnc-preview-docs
| | | * | | | docs: Update JavaDoc reference links for Create Wearable Apps classLuan Nguyen2015-06-152-56/+117
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | bug: 21723175 Change-Id: I3afc72be12e4c08b8dfa0380e315ef5709e2b27c
* | | | | | am 474b4775: am d548b29d: Merge "docs: Update JavaDoc ref links for UI ↵Luan Nguyen2015-06-176-127/+247
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | training." into mnc-preview-docs * commit '474b4775edb0154ad8f5b85a53fb2c689de69b40': docs: Update JavaDoc ref links for UI training.
| * | | | | am d548b29d: Merge "docs: Update JavaDoc ref links for UI training." into ↵Luan Nguyen2015-06-176-127/+247
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-preview-docs * commit 'd548b29def4006c0a19df090189198e51715bccd': docs: Update JavaDoc ref links for UI training.
| | * | | | Merge "docs: Update JavaDoc ref links for UI training." into mnc-preview-docsLuan Nguyen2015-06-176-127/+247
| | |\ \ \ \
| | | * | | | docs: Update JavaDoc ref links for UI training.Luan Nguyen2015-06-126-127/+247
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update sample snippets in 2d-picker. bug: 21660558 bug: 19059844 Change-Id: Ibc156a21329d1549f6d33ed75130f7b6edda85b2
* | | | | | | am 31217aa5: am e343e673: Merge "Update landing page link to skip the ↵Joe Fernandez2015-06-172-5/+5
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Preview landing page plus copy edit" into mnc-preview-docs * commit '31217aa591e4f0acc5937d51a2455c36b44da7e2': Update landing page link to skip the Preview landing page plus copy edit
| * | | | | | am e343e673: Merge "Update landing page link to skip the Preview landing ↵Joe Fernandez2015-06-172-5/+5
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | page plus copy edit" into mnc-preview-docs * commit 'e343e673eca0c0e3b943ce7ddd27b37e29a873f4': Update landing page link to skip the Preview landing page plus copy edit
| | * | | | | Merge "Update landing page link to skip the Preview landing page plus copy ↵Joe Fernandez2015-06-162-5/+5
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | edit" into mnc-preview-docs
| | | * | | | | Update landing page link to skip the Preview landing pagesmain@google.com2015-06-052-5/+5
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | plus copy edit Change-Id: I1bd38b7647e8019a5a656b967c422f8c22261bb0
* | | | | | | am 83ee59d5: am 375ad9e1: docs: Updated the TV docs to indicate that ↵Quddus Chong2015-06-161-1/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SUGGEST_COLUMN_DURATION is required. bug: 21400628 * commit '83ee59d5de365669cd7a9d8bfa552a90678d0587': docs: Updated the TV docs to indicate that SUGGEST_COLUMN_DURATION is required. bug: 21400628
| * | | | | | am 375ad9e1: docs: Updated the TV docs to indicate that ↵Quddus Chong2015-06-161-1/+2
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SUGGEST_COLUMN_DURATION is required. bug: 21400628 * commit '375ad9e1ebc327b87f378f1e0d3cf12f058e5f36': docs: Updated the TV docs to indicate that SUGGEST_COLUMN_DURATION is required. bug: 21400628
| | * | | | | docs: Updated the TV docs to indicate that SUGGEST_COLUMN_DURATION is required.Quddus Chong2015-06-161-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 21400628 Change-Id: I001cb429b94bed8e6a7524f2b7c6a7ced240f33d
* | | | | | | am c75034f1: am c7965b02: Merge "docs: Added new "100 days" video to AfW ↵Andrew Solovay2015-06-161-1/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | / | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | landing page" into mnc-preview-docs * commit 'c75034f1e40719aeec3e703d51414ac05fe2ca98': docs: Added new "100 days" video to AfW landing page
| * | | | | am c7965b02: Merge "docs: Added new "100 days" video to AfW landing page" ↵Andrew Solovay2015-06-161-1/+2
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-preview-docs * commit 'c7965b024d660b62e5500e4bb8a3f942960dddf1': docs: Added new "100 days" video to AfW landing page
| | * | | | Merge "docs: Added new "100 days" video to AfW landing page" into ↵Andrew Solovay2015-06-161-1/+2
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | mnc-preview-docs
| | | * | | | docs: Added new "100 days" video to AfW landing pageAndrew Solovay2015-06-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See first comment for doc stage location. Change-Id: Ic05d35efe8a8529d6cc45ba4e055a137ce88f945
* | | | | | | am 418ff647: am 79b30681: Merge "docs: Fixed broken links in TV publishing ↵Quddus Chong2015-06-151-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | checklist. bug: 19298571" into mnc-preview-docs * commit '418ff64748cb866d3dec8a448efffb0cbceec52d': docs: Fixed broken links in TV publishing checklist. bug: 19298571
| * | | | | | am 79b30681: Merge "docs: Fixed broken links in TV publishing checklist. ↵Quddus Chong2015-06-151-2/+2
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 19298571" into mnc-preview-docs * commit '79b30681bbe26b95a8705e17957c1063517ec8f3': docs: Fixed broken links in TV publishing checklist. bug: 19298571
| | * | | | | docs: Fixed broken links in TV publishing checklist.Quddus Chong2015-06-151-2/+2
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 19298571 Change-Id: I5a4d6df6e7c8dd0e1f9ffb652375fa265b677013
* | | | | | am c6d33420: am 4decc115: Merge "Doc change: move ndk docs jd into main docs ↵Dirk Dougherty2015-06-15126-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tree." into mnc-preview-docs * commit 'c6d3342064db4982298d0ebe79c8b974c57b99a7': Doc change: move ndk docs jd into main docs tree.
| * | | | | am 4decc115: Merge "Doc change: move ndk docs jd into main docs tree." into ↵Dirk Dougherty2015-06-13126-0/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-preview-docs * commit '4decc115ae4fc846fffda238569d6c55451a63af': Doc change: move ndk docs jd into main docs tree.
| | * | | | Merge "Doc change: move ndk docs jd into main docs tree." into mnc-preview-docsDirk Dougherty2015-06-13126-0/+0
| | |\ \ \ \
| | | * | | | Doc change: move ndk docs jd into main docs tree.Dirk Dougherty2015-06-12126-0/+0
| | | | |_|/ | | | |/| | | | | | | | | | | | | | Change-Id: I5c1ac7645dc68c28da97f46babcab5926c38dbea
* | | | | | am ecc50268: am 6243dfd9: Merge "docs: Added AfW videos to "Android for ↵Andrew Solovay2015-06-153-9/+45
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Work" landing page" into mnc-preview-docs * commit 'ecc50268d72f0084a96bf98494229a294be10458': docs: Added AfW videos to "Android for Work" landing page
| * | | | | am 6243dfd9: Merge "docs: Added AfW videos to "Android for Work" landing ↵Andrew Solovay2015-06-123-9/+45
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | page" into mnc-preview-docs * commit '6243dfd9ab25dfd11d0e09cbe02e8a863ddafe07': docs: Added AfW videos to "Android for Work" landing page
| | * | | | Merge "docs: Added AfW videos to "Android for Work" landing page" into ↵Andrew Solovay2015-06-123-9/+45
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | mnc-preview-docs
| | | * | | | docs: Added AfW videos to "Android for Work" landing pageAndrew Solovay2015-06-093-9/+45
| | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | See first comment for stage location. Change-Id: I61465141e31ef92308aa4f26fcd085529d29c220
* | | | | | am afb19e27: am 726db0af: Merge "docs: sdk tools 24.3.2 download updates" ↵Rich Slogar2015-06-151-6/+6
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-preview-docs * commit 'afb19e27ccc80415956c1b63ddb19e953a7c3f20': docs: sdk tools 24.3.2 download updates
| * | | | | am 726db0af: Merge "docs: sdk tools 24.3.2 download updates" into ↵Rich Slogar2015-06-121-6/+6
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-preview-docs * commit '726db0aff535e7e734426c6c33ae2c5443e34fa5': docs: sdk tools 24.3.2 download updates
| | * | | | Merge "docs: sdk tools 24.3.2 download updates" into mnc-preview-docsRich Slogar2015-06-121-6/+6
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | docs: sdk tools 24.3.2 download updatesRich Slogar2015-06-111-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie7a008e1b1a7a686436a72e049f8b7e6c1a66350
* | | | | | Merge "Remove bookmarks provider and associated permissions - framework" ↵Svetoslav2015-06-141-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into mnc-dev
| * | | | | | Remove bookmarks provider and associated permissions - frameworkSvetoslav2015-06-111-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7f5a2f14a12da473f05a5075d98e762f8f8ed970