summaryrefslogtreecommitdiffstats
path: root/docs
Commit message (Expand)AuthorAgeFilesLines
* am ff0cb373: am 554ed0f0: Merge "Fixed typo in Recreating an Activity documen...Amith Yamasani2013-01-021-1/+1
|\
| * am 554ed0f0: Merge "Fixed typo in Recreating an Activity documentation"Amith Yamasani2013-01-021-1/+1
| |\
| | * Fixed typo in Recreating an Activity documentationGulshan Singh2012-12-211-1/+1
* | | am 1a9c5a5f: am 96f0e008: am 481102ee: am 0dae634b: Merge "docs: add class on...Scott Main2012-12-2810-14/+718
|\ \ \ | |/ /
| * | am 96f0e008: am 481102ee: am 0dae634b: Merge "docs: add class on keyboards" i...Scott Main2012-12-2110-14/+718
| |\ \
| | * \ Merge "docs: add class on keyboards" into jb-mr1-devScott Main2012-12-2110-14/+718
| | |\ \
| | | * | docs: add class on keyboardsScott Main2012-12-2110-14/+718
* | | | | am 51627153: am 8c8fd247: am cee5267b: am dc2c1a0f: docs: add explanation of ...Scott Main2012-12-282-2/+30
|\ \ \ \ \ | |/ / / /
| * | | | am 8c8fd247: am cee5267b: am dc2c1a0f: docs: add explanation of default permi...Scott Main2012-12-212-2/+30
| |\ \ \ \ | | |/ / /
| | * | | docs: add explanation of default permissions to Permission guideScott Main2012-12-212-2/+30
| | |/ /
* | | | am 12f2f8dc: am 87d852a8: am ec6d0847: am 5b03460f: Merge "cherrypick from jb...kmccormick@google.com2012-12-288-1/+1502
|\ \ \ \ | |/ / /
| * | | am 87d852a8: am ec6d0847: am 5b03460f: Merge "cherrypick from jb-dev-docs: Ge...kmccormick@google.com2012-12-218-1/+1502
| |\ \ \ | | |/ /
| | * | Merge "cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c...&& repo sync -j82012-12-218-1/+1502
| | |\ \
| | | * | cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72...&& repo sync -j82012-12-208-1/+1502
* | | | | am b7f4bf36: am f6c71644: am e487e537: am 0402b653: Merge "Doc change: point ...Dirk Dougherty2012-12-201-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | am f6c71644: am e487e537: am 0402b653: Merge "Doc change: point developer lan...Dirk Dougherty2012-12-201-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge "Doc change: point developer landing page featured content to blog post...Dirk Dougherty2012-12-201-1/+1
| | |\ \ \
| | | * | | Doc change: point developer landing page featured content to blog post.Dirk Dougherty2012-12-201-1/+1
* | | | | | am d1ecaf39: am 15423b20: am 226e973f: am 8afb3ba4: Merge "docs: SDK r21.0.1 ...Scott Main2012-12-204-29/+251
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 15423b20: am 226e973f: am 8afb3ba4: Merge "docs: SDK r21.0.1 Release Notes...Scott Main2012-12-204-29/+251
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "docs: SDK r21.0.1 Release Notes" into jb-mr1-devScott Main2012-12-204-29/+251
| | |\ \ \ \
| | | * | | | docs: SDK r21.0.1 Release NotesJoe Fernandez2012-12-174-37/+260
* | | | | | | am 0aa3df58: am c3261bd8: am 76f7774d: am f6e55123: Merge "docs: NDK r8d Rele...Scott Main2012-12-201-10/+173
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am c3261bd8: am 76f7774d: am f6e55123: Merge "docs: NDK r8d Release Notes" in...Scott Main2012-12-201-10/+173
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "docs: NDK r8d Release Notes" into jb-mr1-devScott Main2012-12-201-10/+173
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | docs: NDK r8d Release NotesJoe Fernandez2012-12-171-10/+173
| | | |/ / /
* | | | | | am 0943862c: am edafbe79: am a232fa3f: am 0f0d9b32: Merge "Doc change: update...Dirk Dougherty2012-12-202-16/+16
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am edafbe79: am a232fa3f: am 0f0d9b32: Merge "Doc change: update develop land...Dirk Dougherty2012-12-202-16/+16
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Doc change: update develop landing page." into jb-mr1-devDirk Dougherty2012-12-202-16/+16
| | |\ \ \ \
| | | * | | | Doc change: update develop landing page.Dirk Dougherty2012-12-172-16/+16
* | | | | | | am f36ced0a: am a6cf72d8: am 18ac5570: am db49d317: Merge "Doc change: add me...Scott Main2012-12-192-10/+57
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am a6cf72d8: am 18ac5570: am db49d317: Merge "Doc change: add mention of loca...Scott Main2012-12-192-10/+57
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Doc change: add mention of localized promo graphics." into jb-mr1-devScott Main2012-12-192-10/+57
| | |\ \ \ \ \
| | | * | | | | Doc change: add mention of localized promo graphics.Dirk Dougherty2012-12-172-10/+57
| | | |/ / / /
| | * | | | | Update the JNI spec link, and remove a dead link.Elliott Hughes2012-12-192-723/+3
* | | | | | | am 44a0489f: am 46dd710a: am 89523cfe: am 4c59230a: am d4289c6e: am c84b3603:...Joe Malin2012-12-197-0/+869
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 46dd710a: am 89523cfe: am 4c59230a: am d4289c6e: am c84b3603: am 8dd6275e:...Joe Malin2012-12-197-0/+869
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am d4289c6e: am c84b3603: am 8dd6275e: Android Training: Multiple ThreadsJoe Malin2012-12-197-0/+869
| | |\ \ \ \ \
| | | * \ \ \ \ am 8dd6275e: Android Training: Multiple ThreadsJoe Malin2012-12-197-0/+869
| | | |\ \ \ \ \
| | | | * | | | | Android Training: Multiple ThreadsJoe Malin2012-12-197-0/+869
* | | | | | | | | am a8d7b52c: am 171a9906: Merge "Update the JNI spec link, and remove a dead ...Elliott Hughes2012-12-192-723/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 171a9906: Merge "Update the JNI spec link, and remove a dead link."Elliott Hughes2012-12-192-723/+3
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | Update the JNI spec link, and remove a dead link.Elliott Hughes2012-12-182-723/+3
| | * | | | | | | Merge jb-mr1-dev into aosp/master - do not mergeThe Android Open Source Project2012-11-27275-3003/+59474
| | |\ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ am 0c1badc6: am c799aee9: am 858eb008: am 34bdf0ab: docs: Reverting SDK r21.0...Joe Fernandez2012-12-175-423/+38
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am c799aee9: am 858eb008: am 34bdf0ab: docs: Reverting SDK r21.0.1 and NDK r8...Joe Fernandez2012-12-175-423/+38
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| | * | | | | | | | docs: Reverting SDK r21.0.1 and NDK r8d Release Notes due to release conflictJoe Fernandez2012-12-175-423/+38
* | | | | | | | | | am c06052e6: am baca4e5a: am dfb46cea: am 90172e0f: Merge "docs: App Template...Joe Fernandez2012-12-1711-66/+450
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am baca4e5a: am dfb46cea: am 90172e0f: Merge "docs: App Template Tool documen...Joe Fernandez2012-12-1711-66/+450
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge "docs: App Template Tool documentation" into jb-mr1-devJoe Fernandez2012-12-1711-66/+450
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |