summaryrefslogtreecommitdiffstats
path: root/docs/html/training/basics
Commit message (Expand)AuthorAgeFilesLines
* Docs: Fixing files that didn't merge properly from mnc-preview-docsDavid Friedman2015-08-173-29/+11
* resolved conflicts for merge of cbc1ac33 to masterChris Banes2015-02-182-45/+83
|\
| * Merge "docs: studio training basics create and run project updates" into lmp-...Rich Slogar2015-02-172-44/+64
| |\
| | * docs: studio training basics create and run project updatesRich Slogar2015-01-302-44/+64
* | | am a6614a12: am 53ec037f: am 03efba0e: Merge "This file is misplaced, and ser...David Friedman2015-02-171-83/+0
|\ \ \ | |/ /
| * | This file is misplaced, and serves no purpose. I am sending it to oblivion.David Friedman2015-02-121-83/+0
* | | am 1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs aut...Joe Fernandez2015-01-311-1/+2
|\ \ \ | |/ /
| * | docs: training intent doc error updateRich Slogar2015-01-301-1/+2
| |/
* | Merge "Remove references to apache-http from various documents."Narayan Kamath2014-12-121-2/+2
|\ \
| * | Remove references to apache-http from various documents.Narayan Kamath2014-12-121-2/+2
* | | am 9a6d1d9f: am c0f96532: am 8cd0bb2d: Merge "add helpouts widget to wave 3 p...smain@google.com2014-12-119-2/+16
|\ \ \ | |/ / |/| / | |/
| * add helpouts widget to wave 3 pagessmain@google.com2014-12-109-2/+16
* | resolved conflicts for merge of c137d08c to mastersmain@google.com2014-12-091-1/+1
|\ \ | |/
| * revisions to Studio landing pagesmain@google.com2014-12-081-1/+1
| * misc fixes for studio launch:smain@google.com2014-12-083-34/+34
| * docs:building your first app [CP]Rich Slogar2014-12-062-7/+5
| * docs: Training refactor for Android Studio [CP]Scott Rowe2014-12-065-460/+575
* | docs:building your first appRich Slogar2014-12-052-7/+5
* | am 2dc4cfa0: am 74bafd41: am 555d6e70: am 2411fe88: Merge "add the helpouts w...smain@google.com2014-11-2118-51/+32
|\ \ | |/
| * add the helpouts widget and necessary tags to "wave 2" of the Getting Started...smain@google.com2014-11-1818-51/+32
| * revise helpouts tags to use just one on each pagesmain@google.com2014-10-313-3/+3
* | am a004c2ec: am 9b00d795: am 0da6b005: revise helpouts tags to use just one o...smain@google.com2014-11-013-3/+3
|\ \
| * | revise helpouts tags to use just one on each pagesmain@google.com2014-10-313-3/+3
| |/
* | docs: Training refactor for Android Studio Cherrypick from lmp-docs hange-Id:...Scott Rowe2014-10-305-460/+575
|/
* fix a few of the tags for helpouts compatibilitysmain@google.com2014-10-223-3/+3
* add helpouts widget to first round of pagessmain@google.com2014-10-225-20/+15
* fix confusing sentencesmain@google.com2014-10-021-3/+3
* am c799a830: am 88d1c560: am ea5fa98c: am c659e746: Merge "Doc update: new Vo...Katie McCormick2014-06-042-0/+10
|\
| * Doc update: new Volley classKatie McCormick2014-05-292-0/+10
* | am 7a940a49: am 3d55247a: am a0144782: am 6d05170a: docs: b/14510382 ISO lang...Scott Rowe2014-05-191-2/+3
|\ \ | |/
| * docs: b/14510382 ISO language code, add linkScott Rowe2014-05-161-2/+3
* | resolved conflices for merge of 93ccd1a2 to masterDirk Dougherty2014-05-143-2/+3
|\ \ | |/
| * Doc change: Updated content for distribute.Dirk Dougherty2014-05-143-2/+3
* | am 1ac6519b: am c31bd52d: am a821af68: am 715139a6: Merge "docs: Fixed action...Ricardo Cervera2014-04-041-2/+2
|\ \ | |/
| * docs: Fixed action bar example. Bug: 13806963Ricardo Cervera2014-04-041-2/+2
* | am 04c2a557: am c013eaad: am 5a218b18: am 8e183798: Merge "docs: Added notes ...Ricardo Cervera2014-04-023-34/+42
|\ \ | |/
| * docs: Added notes to use the last SDK version to the Build your First App class.Ricardo Cervera2014-04-013-34/+42
* | am d387206a: am 7890eeff: am 882ba89b: am 50694917: am 7e566239: Merge "docs:...Ricardo Cervera2014-03-144-39/+54
|\ \ | |/
| * docs: Updated Building your First App tutorial. Bug: 13429905Ricardo Cervera2014-03-134-39/+54
* | am 5f41b262: am aec930b2: am f70d7b9a: am cf5ed42f: am df75bdcc: rewrite inte...Scott Main2013-12-112-4/+8
|\ \ | |/
| * rewrite intent guide and add doc with intents supported by platform appsScott Main2013-12-102-4/+8
* | Removing quotes from page.tags valuesJoe Fernandez2013-11-148-8/+8
|/
* DOC CHANGE: FileProvider training classJoe Malin2013-10-114-9/+12
* fix typo in code commentScott Main2013-10-081-3/+3
* add jb mr2 uses-feature items to reference page and fix a couple doc bugsScott Main2013-08-261-4/+1
* fix markup errors in action bar styling,Scott Main2013-08-224-22/+36
* Merge "update Getting Started class about fragments to remove support lib les...Scott Main2013-08-012-14/+26
|\
| * update Getting Started class about fragments to remove support lib lessonScott Main2013-07-302-14/+26
* | new class on using action bar for training basicsScott Main2013-08-016-1/+980
|/
* fix a few bugs.Scott Main2013-07-301-11/+12