summaryrefslogtreecommitdiffstats
path: root/docs/html
Commit message (Expand)AuthorAgeFilesLines
* Fix the spelling of "retrieves"Scott Kennedy2013-01-111-1/+1
* Fixed typo in Recreating an Activity documentationGulshan Singh2012-12-211-1/+1
* 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 7112cd46: am 2f9947e9: am ddf10d44: Merge "Doc Update: Removed "no guarant...kmccormick@google.com2012-11-191-1/+0
| |\
| | * am ddf10d44: Merge "Doc Update: Removed "no guaranteed delivery" line." into ...kmccormick@google.com2012-11-191-1/+0
| | |\
| | | * Merge "Doc Update: Removed "no guaranteed delivery" line." into jb-dev-docs&& repo sync -j82012-11-191-1/+0
| | | |\
| | | | * Doc Update: Removed "no guaranteed delivery" line.&& repo sync -j82012-11-141-1/+0
| * | | | cherrypick from Change-Id: I70cb9111ff5f5a156cecb433b3baf7925a6be1a8Jaewan Kim2012-11-191-2/+2
| * | | | docs: move articles into group directoryScott Main2012-11-165-4/+4
| * | | | docs: revise getting started introScott Main2012-11-151-2/+2
| * | | | docs: update checksums/sizes for new adt bundlesScott Main2012-11-151-6/+6
| * | | | Merge "docs: update sdk install to handle both 32 and 64-bit bundles" into jb...Scott Main2012-11-151-35/+24
| |\ \ \ \
| | * | | | docs: update sdk install to handle both 32 and 64-bit bundlesScott Main2012-11-151-35/+24
| * | | | | Merge "docs: fix ndk tos layout for small screens" into jb-mr1-devScott Main2012-11-151-2/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | docs: fix ndk tos layout for small screensScott Main2012-11-151-2/+2
| * | | | | docs: fix broken youtube playlistsScott Main2012-11-151-9/+9
| |/ / / /
| * | | | am 596d0e38: am f53c5f36: am d1ae2721: Merge "Doc Update: Fixing images" into...kmccormick@google.com2012-11-154-3/+3
| |\ \ \ \ | | |/ / /
| | * | | am d1ae2721: Merge "Doc Update: Fixing images" into jb-dev-docskmccormick@google.com2012-11-154-3/+3
| | |\ \ \ | | | |/ /
| | | * | Merge "Doc Update: Fixing images" into jb-dev-docs&& repo sync -j82012-11-154-3/+3
| | | |\ \
| | | | * | Doc Update: Fixing images&& repo sync -j82012-11-144-3/+3
| | | | |/
| * | | | resolved conflicts for merge of 783e115b to jb-mr1-devScott Main2012-11-1420-2036/+1834
| |\ \ \ \ | | |/ / /
| | * | | am 22cc2764: implement new organization for Training classes This also moves ...Scott Main2012-11-1420-2033/+1834
| | |\ \ \ | | | |/ /
| | | * | implement new organization for Training classesScott Main2012-11-1420-2033/+1834
| * | | | Merge "docs: Added note on MIPS system image additions" into jb-mr1-devJoe Fernandez2012-11-141-0/+2
| |\ \ \ \
| | * | | | docs: Added note on MIPS system image additionsJoe Fernandez2012-11-141-0/+2
| * | | | | Merge "docs: add warning for adt bundle on 32-bit os" into jb-mr1-devScott Main2012-11-141-0/+26
| |\ \ \ \ \
| | * | | | | docs: add warning for adt bundle on 32-bit osScott Main2012-11-141-0/+26
| | |/ / / /
| * | | | | Merge "docs: Updated uiautomator API docs to reflect correct API level. bug: ...Quddus Chong2012-11-142-6/+24
| |\ \ \ \ \
| | * | | | | docs: Updated uiautomator API docs to reflect correct API level.Quddus Chong2012-11-142-6/+24
| | |/ / / /
| * | | | | Merge "docs: Update Nexus 10 device frames for darker, more accurate bezel re...Roman Nurik2012-11-147-0/+0
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | docs: Update Nexus 10 device frames for darker, more accurate bezel rendering.Roman Nurik2012-11-147-0/+0
| * | | | | Merge "docs: Update platform version page with 4.2 release" into jb-mr1-devJoe Fernandez2012-11-131-3/+96
| |\ \ \ \ \
| | * | | | | docs: Update platform version page with 4.2 releaseJoe Fernandez2012-11-131-3/+96
| * | | | | | Merge "docs: add ndk tos wall" into jb-mr1-devScott Main2012-11-132-21/+195
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | docs: add ndk tos wallScott Main2012-11-132-21/+195
| * | | | | | Merge "Doc change: update image for landing page." into jb-mr1-devDirk Dougherty2012-11-132-1/+1
| |\ \ \ \ \ \
| | * | | | | | Doc change: update image for landing page.Dirk Dougherty2012-11-132-1/+1
| * | | | | | | Merge "docs: edits" into jb-mr1-devScott Main2012-11-131-18/+19
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| / / / / / | | |/ / / / /
| | * | | | | docs: editsScott Main2012-11-131-18/+19
| * | | | | | Merge "docs: add templated tabs for jb highlights" into jb-mr1-devScott Main2012-11-132-41/+10
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | docs: add templated tabs for jb highlightsScott Main2012-11-132-41/+10
| * | | | | | Doc change: edits and landing page.Dirk Dougherty2012-11-132-15/+15
| * | | | | | Merge "Doc change: image optimizations for docs." into jb-mr1-devDirk Dougherty2012-11-131-0/+0
| |\ \ \ \ \ \
| | * | | | | | Doc change: image optimizations for docs.Dirk Dougherty2012-11-131-0/+0
| * | | | | | | Merge "docs: fix bug with unknown anchors" into jb-mr1-devScott Main2012-11-131-2/+7
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| / / / / / | | |/ / / / /
| | * | | | | docs: fix bug with unknown anchorsScott Main2012-11-131-2/+7
| * | | | | | Merge "docs: add tabs to JB highlights" into jb-mr1-devScott Main2012-11-131-38/+144
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | docs: add tabs to JB highlightsScott Main2012-11-131-38/+144
| * | | | | | Doc change: resize some assets for highlights.Dirk Dougherty2012-11-136-1/+1
| |/ / / / /