summaryrefslogtreecommitdiffstats
path: root/docs/html/guide
Commit message (Expand)AuthorAgeFilesLines
* am 1e59b338: am 08314642: am 90312d80: am 22878790: am 93f94c2c: resolved con...Ricardo Cervera2015-01-161-1/+3
|\
| * am 08314642: am 90312d80: am 22878790: am 93f94c2c: resolved conflicts for me...Ricardo Cervera2015-01-161-1/+3
| |\
| | * am 22878790: am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-devRicardo Cervera2015-01-161-1/+3
| | |\
| | | * resolved conflicts for merge of e8f6bd48 to lmp-devRicardo Cervera2015-01-161-1/+3
| | | |\
| | | | * am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(...Ricardo Cervera2015-01-161-1/+3
| | | | |\
| | | | | * docs: Added info on noHistory and onActivityResult(). Bug: 13807256Ricardo Cervera2014-11-051-1/+3
* | | | | | am c2d95052: am 62ceea31: am f5569413: docs: Fix broken link in Common Intent...Ricardo Cervera2015-01-131-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 62ceea31: am f5569413: docs: Fix broken link in Common Intents automerge: ...Ricardo Cervera2015-01-131-2/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 62ceea31: am f5569413: docs: Fix broken link in Common Intents automerge: ...Ricardo Cervera2015-01-131-2/+2
| | |\ \ \ \ | | | |/ / /
| | | * | | docs: Fix broken link in Common IntentsRicardo Cervera2015-01-131-2/+2
* | | | | | am 909f840c: am 4c5b5cff: Merge "resolved conflicts for merge of ea0137ef to ...Joe Fernandez2015-01-071-14/+14
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 909f840c: am 4c5b5cff: Merge "resolved conflicts for merge of ea0137ef to ...Joe Fernandez2015-01-071-14/+14
| |\ \ \ \ \ | | |/ / / /
| | * | | | resolved conflicts for merge of ea0137ef to lmp-mr1-devScott Rowe2015-01-061-14/+14
| | |\ \ \ \ | | | |/ / /
| | | * | | docs: Checklist for TV AppsScott Rowe2015-01-051-14/+14
* | | | | | am dfc950b4: am aa7c1f68: am 13d31b0a: am d7d1411a: am e2b44f86: docs: Making...Scott Rowe2015-01-061-48/+48
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am dfc950b4: am aa7c1f68: am 13d31b0a: am d7d1411a: am e2b44f86: docs: Making...Scott Rowe2015-01-061-48/+48
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 13d31b0a: am d7d1411a: am e2b44f86: docs: Making TV Apps Searchable - new ...Scott Rowe2015-01-061-48/+48
| | |\ \ \ \ | | | |/ / /
| | | * | | docs: Making TV Apps Searchable - new trainingScott Rowe2014-12-191-48/+48
| | * | | | docs: Fix typo, use --> userNick Chalko2014-12-041-1/+1
* | | | | | Remove references to apache-http from various documents.Narayan Kamath2014-12-122-6/+4
|/ / / / /
* | | | | am 6e21817b: am d23f8b44: Merge "Revert "Camera: Add new capability flags as ...Eino-Ville Talvala2014-12-041-9/+1
|\ \ \ \ \ | |/ / / /
| * | | | Revert "Camera: Add new capability flags as system features as well"Eino-Ville Talvala2014-12-031-9/+1
* | | | | am e289082a: am dfa99f63: Merge "Camera: Add new capability flags as system f...Eino-Ville Talvala2014-11-241-1/+25
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Camera: Add new capability flags as system features as well" into lmp-...Eino-Ville Talvala2014-11-221-1/+25
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Camera: Add new capability flags as system features as wellEino-Ville Talvala2014-11-201-1/+25
* | | | | am 9e9d1cd3: am a505d0be: am 63108ee3: am 02cb1fe6: am 14f78ed7: Merge "docs:...Scott Rowe2014-11-241-0/+44
|\ \ \ \ \ | |/ / / /
| * | | | Merge "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to...Scott Rowe2014-11-211-0/+44
| |\ \ \ \
| | * | | | docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21Scott Rowe2014-11-071-0/+44
| * | | | | Fix and be more explicit about plurals best practices.Elliott Hughes2014-11-191-4/+12
| | |/ / / | |/| | |
* | | | | am ec2d8d0b: am ea8ff822: Merge "Fix and be more explicit about plurals best ...Elliott Hughes2014-11-201-4/+12
|\ \ \ \ \
| * | | | | Fix and be more explicit about plurals best practices.Elliott Hughes2014-11-191-4/+12
| * | | | | am f21746fc: Merge "docs: update location of sample apps" into lmp-devJoe Fernandez2014-10-171-5/+5
| |\ \ \ \ \
| * \ \ \ \ \ am 22fa76da: Merge "Doc change: Add Lollipop to platform versions table." int...Dirk Dougherty2014-10-171-0/+11
| |\ \ \ \ \ \
| * \ \ \ \ \ \ docs: Notifications changes for LScott Rowe2014-10-171-208/+173
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge "docs: Recents screen for tasks and activities" into lmp-devJoe Fernandez2014-10-174-81/+431
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge "Android 5.0 changes to IME switching" into lmp-devJoe Fernandez2014-10-171-185/+333
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ am 447369f2: am a1e3063e: am ab64919c: Merge "docs: update reference to Fragm...Scott Rowe2014-10-161-3/+4
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ am d12e6de6: Merge "OpenGL 3.1 and AEP documentation for L-release." into lmp...David Friedman2014-10-161-21/+74
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ am 0ae82b05: resolved conflicts for merge of a4eb81b6 to lmp-devNick Kralevich2014-10-141-25/+31
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ am dbcfc8ef: am a18075e8: am bd964cad: docs: Removing references to self note...Ricardo Cervera2014-10-071-87/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am 692bb81c: am 6d30f576: am 3f7b4d8f: Merge "docs: Update Common Intents pag...Ricardo Cervera2014-10-074-12/+948
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d84ce32b: Merge "Fix some documentation typos." into lmp-devNewton Allen2014-10-021-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am de71dd5c: am 92ad1d81: am b2a2d2c2: am e9fddfd8: am 0d18b091: Merge "docs:...Ricardo Cervera2014-11-191-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge "docs: Add link to "Voice search in your app" video." into lmp-docsRicardo Cervera2014-11-181-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | docs: Add link to "Voice search in your app" video.Ricardo Cervera2014-11-181-0/+8
* | | | | | | | | | | | | | | | | | am e9e96e7f: am 7d0d2f6c: am c6bd0155: am 8d88f19b: am f9c4f6b5: Merge "fix c...smain@google.com2014-11-121-6/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | fix code type and mention api level 21 exception for bindService()smain@google.com2014-11-121-6/+8
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | am 1117098b: am d4e3825a: am 1b2cf3f8: am cd796536: Merge "docs: b/18119632 i...Scott Rowe2014-11-032-72/+126
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | docs: b/18119632 isGame, b/18119595 bannerScott Rowe2014-10-312-72/+126
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | am 3be4e43b: am 543a82ed: am 51209aa3: am 43582423: am 0fa6edce: Fixes linebr...David Friedman2014-10-301-221/+124
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /