summaryrefslogtreecommitdiffstats
path: root/docs/html/sdk
Commit message (Collapse)AuthorAgeFilesLines
* Merge "docs:download updates for studio"Scott Main2014-11-261-39/+101
|\
| * docs:download updates for studioRich Slogar2014-11-251-39/+101
| | | | | | | | Change-Id: I3d0f5f39a6c8d5264cc5c9bb6c8a24ec75c6f7b4
* | am e663434a: am af56f979: am b04c3d62: am bb987493: am 96424f4a: am ↵Ricardo Cervera-Navarro2014-11-171-17/+1
|\ \ | |/ |/| | | | | | | | | 5b11c51d: Merge "docs:eclipse-migrate update" into lmp-docs * commit 'e663434a6f8051967a108c312773757233985d21': docs:eclipse-migrate update
| * Merge "docs:eclipse-migrate update" into lmp-docsRicardo Cervera-Navarro2014-11-171-17/+1
| |\
| | * docs:eclipse-migrate updateRich Slogar2014-10-281-17/+1
| | | | | | | | | | | | | | | https://code.google.com/p/android/issues/detail?id=78229 Change-Id: Ia2e263bf550369208d77c82b47db3bd4a4b23ad6
* | | am c9a5af5a: am aaafc8ec: am faac8b79: am c3d174a0: am 848d9125: am ↵Rich Slogar2014-11-051-1/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | 1afa82dc: docs:remove sdk/ndk note * commit 'c9a5af5a5dca4f293c44c0632c3fc4b4042e1c36': docs:remove sdk/ndk note
| * | docs:remove sdk/ndk noteRich Slogar2014-11-051-1/+0
| | | | | | | | | | | | Change-Id: I3aaebdd14b0b26b041da3ee6872f84f311d4191b
| * | Merge "docs: Add instructions to attach debugger to a running process." into ↵Ricardo Cervera2014-11-051-1/+21
| |\ \ | | | | | | | | | | | | lmp-docs
| | * | docs: Add instructions to attach debugger to a running process.Ricardo Cervera2014-10-271-1/+21
| | |/ | | | | | | | | | | | | | | | https://code.google.com/p/android/issues/detail?id=77527 Change-Id: I0c8d0be14c3e240688a31dacb5690ec821fc2adb
* | | am 85ba0d92: am 0f288c6a: am caecc4ae: am df37d45f: Merge "docs: Add ↵Ricardo Cervera2014-11-051-1/+21
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | instructions to attach debugger to a running process." into lmp-dev automerge: 25a4e21 * commit '85ba0d929f4cd6651e5a288d5840b4ee5854e147': docs: Add instructions to attach debugger to a running process.
| * \ \ Merge "docs: Add instructions to attach debugger to a running process." into ↵Ricardo Cervera2014-11-051-1/+21
| |\ \ \ | | |/ / | |/| | | | | | lmp-dev
| | * | docs: Add instructions to attach debugger to a running process.Ricardo Cervera2014-10-211-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | https://code.google.com/p/android/issues/detail?id=77527 Change-Id: I0c8d0be14c3e240688a31dacb5690ec821fc2adb
* | | | am 12e76b99: am 0e4ef673: am 89e73a1c: am ea17fdec: Merge ↵Joe Fernandez2014-11-011-29/+34
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | "docs:studio-updates-814v2" into lmp-docs automerge: a1caad9 automerge: c312071 * commit '12e76b995dafc167ad8eb96f3d25de5af33be1f6': docs:studio-updates-814v2
| * | | Merge "docs:studio-updates-814v2" into lmp-docsJoe Fernandez2014-10-311-29/+34
| |\ \ \
| | * | | docs:studio-updates-814v2Rich Slogar2014-10-311-29/+34
| | | | | | | | | | | | | | | | | | | | Change-Id: I68f6fb1e40e5b7bbdf25e6ab1340d02116452a02
| * | | | revise helpouts tags to use just one on each pagesmain@google.com2014-10-312-2/+2
| |/ / / | | | | | | | | | | | | Change-Id: I67e9448567a60dec4b140837d58e46aeccf586a5
* | | | am a004c2ec: am 9b00d795: am 0da6b005: revise helpouts tags to use just one ↵smain@google.com2014-11-012-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on each page automerge: b2b3b37 automerge: 07c9807 * commit 'a004c2ec06a5ba3d65786e50171d8cdbb80515c8': revise helpouts tags to use just one on each page
| * | | | revise helpouts tags to use just one on each pagesmain@google.com2014-10-312-2/+2
| |/ / / | | | | | | | | | | | | Change-Id: I67e9448567a60dec4b140837d58e46aeccf586a5
* | | | resolved conflicts for merge of 85118849 to masterNick Kralevich2014-11-012-60/+69
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: Ic4d98e2804dddf3a7fe58bea99f0a4b22ebd605d
| * | | docs:studio-update-814Rich Slogar2014-10-302-58/+67
| | |/ | |/| | | | | | | Change-Id: Ie20289d8ddeb9bace07f05fa79e89e9b850fa0b1
* | | docs: navigation and download updatesRich Slogar2014-10-293-115/+111
|/ / | | | | | | Change-Id: I1bc7613d1ab484118a146f51ee5f22584b9d2a6b
* | Merge "docs: Fixing misc minor bugs." into lmp-devJoe Fernandez2014-10-241-1/+1
|\ \
| * | docs: Fixing misc minor bugs.Ricardo Cervera2014-10-211-1/+1
| |/ | | | | | | | | | | Bug: 13872976 Change-Id: I4ea9893b81d8157bf8699820f25c086fd0c4911c
* | add helpouts widget to first round of pagessmain@google.com2014-10-222-0/+6
|/ | | | Change-Id: I2afafb2bf682c5d514eb1adde27bf0277e709198
* Merge "Updated Android SDK/Studio system requirements" into lmp-devVince Harron2014-10-172-6/+10
|\
| * Updated Android SDK/Studio system requirementsVince Harron2014-10-152-6/+10
| | | | | | | | | | | | | | We're not really supporting ancient Linux/OSX systems, we should update the website to accurately reflect this. Change-Id: Id05df4c4e2a4235d325e099a1f29fb7cbe749675
* | Merge "Doc change: Add diffs for API level 21." into lmp-devDirk Dougherty2014-10-16449-0/+129312
|\ \
| * | Doc change: Add diffs for API level 21.Dirk Dougherty2014-10-15449-0/+129312
| | | | | | | | | | | | Change-Id: I6efad4bb407dbfc7684a5651788e116d624e778e
* | | Merge "Doc change: Add diffs for l-preview -> API level 21." into lmp-devDirk Dougherty2014-10-15388-0/+112062
|\ \ \
| * | | Doc change: Add diffs for l-preview -> API level 21.Dirk Dougherty2014-10-15388-0/+112062
| |/ / | | | | | | | | | Change-Id: Ie60fbe9ed5891dd87fd9ca53f126c4617e09d3bd
* | | am 6fbe299f: am d8d20f52: update analytics event tracking calls to use new ↵smain@google.com2014-10-151-1/+1
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | script bug: 16331906 * commit '6fbe299fa5bcc084cd69899afdc3c77767b7c1f5': update analytics event tracking calls to use new script bug: 16331906
| * | update analytics event tracking calls to use new scriptsmain@google.com2014-10-141-1/+1
| | | | | | | | | | | | | | | | | | bug: 16331906 Change-Id: I4cd8f08509cfb887a424696553404ba3c635151b
* | | am 63cd4977: am 770c3c5e: fix unclickable link due to overlay from offset ↵smain@google.com2014-10-091-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | dev below * commit '63cd4977fd72de401f347ba159a71fe3d04399b3': fix unclickable link due to overlay from offset dev below
| * | fix unclickable link due to overlay from offset dev belowsmain@google.com2014-10-081-1/+1
| | | | | | | | | | | | Change-Id: I59bedd0e928d578a3bd030caa4add4cfa96db83f
* | | am 8267ffcc: am cef9aab6: Merge "make sdk download links use HTTPS bug: ↵smain@google.com2014-10-071-2/+2
|\ \ \ | |/ / | | / | |/ |/| | | | | 8033954" into klp-modular-docs * commit '8267ffccbe58ea348a53a0e6058bf902d6e8932a': make sdk download links use HTTPS bug: 8033954
| * Merge "make sdk download links use HTTPS bug: 8033954" into klp-modular-docssmain@google.com2014-10-031-2/+2
| |\
| | * make sdk download links use HTTPSsmain@google.com2014-09-261-2/+2
| | | | | | | | | | | | | | | | | | bug: 8033954 Change-Id: Idffbb31d397b765fc71ec034d30cc58d1423fdc9
* | | am 1242af06: am 32cfe2bb: am d37afa37: Merge "docs: Unbuntu troubleshooting ↵Ricardo Cervera2014-10-031-4/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | link to CamelCase ID" into klp-modular-docs * commit '1242af060bec63ec3a37512ebbbdbe545bd9f0f7': docs: Unbuntu troubleshooting link to CamelCase ID
| * | docs: Unbuntu troubleshooting link to CamelCase IDRicardo Cervera2014-10-031-4/+4
| | | | | | | | | | | | Change-Id: I705d17346c470563c350df9bb17d23f3fda5fbc5
* | | am 721b3efc: am 46d8d0cd: am c470faab: docs:ADT 23.0.4 doc updatesRich Slogar2014-10-021-4/+4
|\ \ \ | | | | | | | | | | | | | | | | * commit '721b3efc205442e255170d0185ae374b5a5ddc50': docs:ADT 23.0.4 doc updates
| * | | docs:ADT 23.0.4 doc updatesRich Slogar2014-10-021-4/+4
| | | | | | | | | | | | | | | | Change-Id: Ibf412802e7c98ed3beff6c61394f1b3962254d9a
* | | | am 285859b1: am d36dbe09: am e961d0b5: Merge "Revert "docs: Update for ↵Joe Fernandez2014-10-021-4/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Android 23.0.4"" into klp-modular-docs * commit '285859b13728c5cfb6124c11212978f8f95cd9de': Revert "docs: Update for Android 23.0.4"
| * | | Merge "Revert "docs: Update for Android 23.0.4"" into klp-modular-docsJoe Fernandez2014-10-021-4/+4
| |\ \ \ | | |/ / | |/| |
| | * | Revert "docs: Update for Android 23.0.4"Joe Fernandez2014-10-021-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f34d0e69033165b7a6e9c73b99f4ef6ac36b3896. Change-Id: I4d521392733f1b028c72d4623d6d69a4c5910bc4
* | | | am e1e0e05a: am 957f45c3: am 680092c5: Merge "docs: Provide direct link to ↵Ricardo Cervera2014-10-021-3/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Ubuntu troubleshooting." into klp-modular-docs * commit 'e1e0e05a14ebb87ca1921cf21a98b9fa0067b14e': docs: Provide direct link to Ubuntu troubleshooting.
| * | | Merge "docs: Provide direct link to Ubuntu troubleshooting." into ↵Ricardo Cervera2014-10-021-3/+6
| |\ \ \ | | | | | | | | | | | | | | | klp-modular-docs
| | * | | docs: Provide direct link to Ubuntu troubleshooting.Ricardo Cervera2014-10-021-3/+6
| | | | | | | | | | | | | | | | | | | | Change-Id: I6a9f8c3f3ef01abcfdaf95730139156ba443a4be
* | | | | am 74ce7413: am b15cd529: am c074c3a4: Merge "docs: Update for Android ↵Rich Slogar2014-10-021-4/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | 23.0.4" into klp-modular-docs * commit '74ce7413158607af6be2889d7392c2e904c9c210': docs: Update for Android 23.0.4
| * | | | Merge "docs: Update for Android 23.0.4" into klp-modular-docsRich Slogar2014-10-021-4/+4
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | docs: Update for Android 23.0.4Rich Slogar2014-10-021-4/+4
| | | | | | | | | | | | | | | | Change-Id: I7025dcf9bbfd03b555f7f5059d0e35f67f836dcf