summaryrefslogtreecommitdiffstats
path: root/docs/html
Commit message (Expand)AuthorAgeFilesLines
* Merge "followup fix to conflict resolution in Change-Id: I9cc71d672141c23c0c2...smain@google.com2014-12-151-2/+1
|\
| * followup fix to conflict resolution in Change-Id: I9cc71d672141c23c0c2ed0a73d...smain@google.com2014-12-151-2/+1
* | Merge "Remove references to apache-http from various documents."Narayan Kamath2014-12-126-21/+15
|\ \
| * | Remove references to apache-http from various documents.Narayan Kamath2014-12-126-21/+15
* | | am 99385aa9: am e84bf9fd: am d0d76540: am c82392df: am 1ab615b3: Merge "Adds ...David Friedman2014-12-121-3/+11
|\ \ \
| * \ \ am e84bf9fd: am d0d76540: am c82392df: am 1ab615b3: Merge "Adds link to relat...David Friedman2014-12-121-3/+11
| |\ \ \
| | * \ \ am d0d76540: am c82392df: am 1ab615b3: Merge "Adds link to related video." in...David Friedman2014-12-111-3/+11
| | |\ \ \
| | | * \ \ Merge "Adds link to related video." into lmp-docsDavid Friedman2014-12-111-3/+11
| | | |\ \ \
| | | | * | | Adds link to related video.David Friedman2014-12-101-3/+11
* | | | | | | am 6ea9db4b: am 81779694: am c9014b6d: am ea500a3a: am 0aa23445: Merge "docs:...Joe Fernandez2014-12-121-5/+5
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 81779694: am c9014b6d: am ea500a3a: am 0aa23445: Merge "docs: studio basic...Joe Fernandez2014-12-121-5/+5
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am c9014b6d: am ea500a3a: am 0aa23445: Merge "docs: studio basics haxm update...Joe Fernandez2014-12-111-5/+5
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge "docs: studio basics haxm updates" into lmp-docsJoe Fernandez2014-12-111-5/+5
| | | |\ \ \ \
| | | | * | | | docs: studio basics haxm updatesRich Slogar2014-12-111-5/+5
* | | | | | | | am c0276ebd: am af7070e6: am 64d97cb2: am 6621a4f6: am 9fe34d90: Merge "docs:...Ricardo Cervera2014-12-126-11/+26
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am af7070e6: am 64d97cb2: am 6621a4f6: am 9fe34d90: Merge "docs: Fixes to wat...Ricardo Cervera2014-12-126-11/+26
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am 64d97cb2: am 6621a4f6: am 9fe34d90: Merge "docs: Fixes to watch faces docs...Ricardo Cervera2014-12-116-11/+26
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge "docs: Fixes to watch faces docs." into lmp-docsRicardo Cervera2014-12-116-11/+26
| | | |\ \ \ \ \
| | | | * | | | | docs: Fixes to watch faces docs.Ricardo Cervera2014-12-116-11/+26
* | | | | | | | | am cc46ad8d: am 0564cee3: am b490f297: am 5c853c26: am d35216ad: Merge "docs:...Rich Slogar2014-12-121-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 0564cee3: am b490f297: am 5c853c26: am d35216ad: Merge "docs: studio bundl...Rich Slogar2014-12-121-2/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am b490f297: am 5c853c26: am d35216ad: Merge "docs: studio bundle update" int...Rich Slogar2014-12-111-2/+2
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Merge "docs: studio bundle update" into lmp-docsRich Slogar2014-12-111-2/+2
| | | |\ \ \ \ \ \
| | | | * | | | | | docs: studio bundle updateRich Slogar2014-12-111-2/+2
| | | | | |/ / / / | | | | |/| | | |
* | | | | | | | | am 11fc651a: am 07877955: am 5c518b7f: am b32987ec: am c3daed96: Merge "docs:...Joe Fernandez2014-12-121-0/+16
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 07877955: am 5c518b7f: am b32987ec: am c3daed96: Merge "docs: platform upd...Joe Fernandez2014-12-121-0/+16
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am 5c518b7f: am b32987ec: am c3daed96: Merge "docs: platform updates for api ...Joe Fernandez2014-12-111-0/+16
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Merge "docs: platform updates for api 21" into lmp-docsJoe Fernandez2014-12-111-0/+16
| | | |\ \ \ \ \ \
| | | | * | | | | | docs: platform updates for api 21Rich Slogar2014-12-091-0/+16
* | | | | | | | | | am 4cb6d10d: am e3bac3bc: am b64545c8: am 378c71a3: am 235e4be4: Merge "docs:...Joe Fernandez2014-12-121-0/+28
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am e3bac3bc: am b64545c8: am 378c71a3: am 235e4be4: Merge "docs: sdk tools 24...Joe Fernandez2014-12-121-0/+28
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | am b64545c8: am 378c71a3: am 235e4be4: Merge "docs: sdk tools 24.0.1 revision...Joe Fernandez2014-12-111-0/+28
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Merge "docs: sdk tools 24.0.1 revisions" into lmp-docsJoe Fernandez2014-12-111-0/+28
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | docs: sdk tools 24.0.1 revisionsRich Slogar2014-12-101-0/+28
| | | | | |/ / / / / | | | | |/| | | | |
* | | | | | | | | | am d96ed254: am 13e0a650: am a97053fd: am f43c057c: am c7ad6e91: docs: Added ...Andrew Solovay2014-12-121-5/+65
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 13e0a650: am a97053fd: am f43c057c: am c7ad6e91: docs: Added info about ma...Andrew Solovay2014-12-121-5/+65
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | am a97053fd: am f43c057c: am c7ad6e91: docs: Added info about managed profile...Andrew Solovay2014-12-111-5/+65
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | docs: Added info about managed profiles to "Android 5.0 Changes"Andrew Solovay2014-12-101-5/+65
* | | | | | | | | | am 9a6d1d9f: am c0f96532: am 8cd0bb2d: Merge "add helpouts widget to wave 3 p...smain@google.com2014-12-1140-38/+81
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 9a6d1d9f: am c0f96532: am 8cd0bb2d: Merge "add helpouts widget to wave 3 p...smain@google.com2014-12-1140-38/+81
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | am c0f96532: am 8cd0bb2d: Merge "add helpouts widget to wave 3 pages" into lm...smain@google.com2014-12-1140-38/+81
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Merge "add helpouts widget to wave 3 pages" into lmp-docssmain@google.com2014-12-1040-38/+81
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | add helpouts widget to wave 3 pagessmain@google.com2014-12-1040-38/+81
* | | | | | | | | | | am 25964a85: am 7e1b348a: am 4221d7e4: docs: Fix link for moved Android Studi...Luan Nguyen2014-12-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | / / | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | am 25964a85: am 7e1b348a: am 4221d7e4: docs: Fix link for moved Android Studi...Luan Nguyen2014-12-111-1/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | am 7e1b348a: am 4221d7e4: docs: Fix link for moved Android Studio index.Luan Nguyen2014-12-111-1/+1
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | docs: Fix link for moved Android Studio index.Luan Nguyen2014-12-101-1/+1
| | | | |_|_|/ / / | | | |/| | | | |
| * | | | | | | | am 844af56b: am efab8b6f: am bdd6aabd: am d49977d9: Merge "docs: update debug...Joe Fernandez2014-12-101-9/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am efab8b6f: am bdd6aabd: am d49977d9: Merge "docs: update debug menu for deb...Joe Fernandez2014-12-101-9/+1
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Merge "docs: update debug menu for debugging-studio" into lmp-docsJoe Fernandez2014-12-101-9/+1
| | | |\ \ \ \ \ \