summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-12-200-0/+0
|\
| * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-12-190-0/+0
| |\
| | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-12-170-0/+0
| | |\
| | | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-12-140-0/+0
| | | |\
| | | | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-12-130-0/+0
| | | | |\
| | | | | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-12-120-0/+0
| | | | | |\
| | | | | | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-12-110-0/+0
| | | | | | |\
| | | | | | | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-12-100-0/+0
| | | | | | | |\
| | | | | | | | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-12-100-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-12-070-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-12-060-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-12-060-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-12-050-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-12-040-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-12-030-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-12-030-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * Add logging to try and track down bug 7643792Jim Miller2012-11-301-0/+7
| | | | | | | | | | | | | | | | * trigger kernel blocked stack trace on system server watchdogColin Cross2012-11-291-0/+12
| | | | | | | | | | | | | | | | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-11-290-0/+0
| | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-11-270-0/+0
| | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-11-260-0/+0
| | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-11-260-0/+0
| | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-11-190-0/+0
| | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-11-160-0/+0
| | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-11-140-0/+0
| | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-11-060-0/+0
| | | | | | | | | | | | | | | | | | | | | | | |\
* | | | | | | | | | | | | | | | | | | | | | | | \ am 0402b653: Merge "Doc change: point developer landing page featured content...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 8afb3ba4: Merge "docs: SDK r21.0.1 Release Notes" into jb-mr1-devScott 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 f6e55123: Merge "docs: NDK r8d Release Notes" into jb-mr1-devScott 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 0f0d9b32: Merge "Doc change: update develop landing page." into jb-mr1-devDirk 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 db49d317: Merge "Doc change: add mention of localized promo graphics." int...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
| | |/ / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | am 84303f5c: 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-192-723/+3
* | | | | | | | | | | | | | | | | | | | | | | | | | | am 4c59230a: am d4289c6e: am c84b3603: am 8dd6275e: Android Training: Multipl...Joe Malin2012-12-197-0/+869
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | am d4289c6e: am c84b3603: am 8dd6275e: Android Training: Multiple ThreadsJoe Malin2012-12-197-0/+869
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ 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
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a bug where disabled auxilialy IME is unexpectedly re-enabledsatok2012-12-191-0/+9
| |_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 34bdf0ab: docs: Reverting SDK r21.0.1 and NDK r8d Release Notes due to rel...Joe Fernandez2012-12-175-423/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / /