summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | am 50d6f97c: docs: revise space wrapping to avoid "new" tags from breaking ne...Scott Main2011-12-151-0/+2
| | |\ \ \ \ \ \
| | | * | | | | | docs: revise space wrapping to avoid "new" tags from breaking new lines aloneScott Main2011-12-151-0/+2
* | | | | | | | | am a9255cfa: am 0af80fb4: am 0f429ebe: docs: fix bug in script for tab cookiesScott Main2011-12-151-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 0af80fb4: am 0f429ebe: docs: fix bug in script for tab cookiesScott Main2011-12-151-2/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am 0f429ebe: docs: fix bug in script for tab cookiesScott Main2011-12-151-2/+2
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | docs: fix bug in script for tab cookiesScott Main2011-12-151-2/+2
* | | | | | | | | am b90afc2c: am 9839afdd: am 1d42360a: docs: style and script changes for and...Scott Main2011-12-152-3/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 9839afdd: am 1d42360a: docs: style and script changes for android u classesScott Main2011-12-152-3/+3
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am 1d42360a: docs: style and script changes for android u classesScott Main2011-12-152-3/+3
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | / / / / | | | |_|/ / / / | | |/| | | | |
| | | * | | | | docs: style and script changes for android u classesScott Main2011-12-152-3/+3
* | | | | | | | Remove the R/Manifest classes when building the static Java libraryYing Wang2011-12-154-4/+15
* | | | | | | | Don't remove R class to fix the build.Ying Wang2011-12-151-1/+1
* | | | | | | | Merge "Support to build static Java library with Android resource"Ying Wang2011-12-153-0/+76
|\ \ \ \ \ \ \ \
| * | | | | | | | Support to build static Java library with Android resourceYing Wang2011-12-143-0/+76
* | | | | | | | | Merge "Add several module owners to the whitelist"Conley Owens2011-12-151-0/+6
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Add several module owners to the whitelistConley Owens2011-12-151-0/+6
* | | | | | | | | am c7185534: Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-140-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | / / / / / / | | |/ / / / / / | |/| | | | | |
| * | | | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-140-0/+0
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | IML74GThe Android Automerger2011-12-141-1/+1
* | | | | | | | am efe3034c: Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-140-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-140-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | IML74FThe Android Automerger2011-12-141-1/+1
| | * | | | | | IML74EThe Android Automerger2011-12-141-1/+1
* | | | | | | | resolved conflicts for merge of 80fa947b to masterBrian Muramatsu2011-12-142-4/+14
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am fea66cee: Merge "Build Support for CTS Native Tests" into ics-mr1Brian Muramatsu2011-12-142-4/+14
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | Merge "Build Support for CTS Native Tests" into ics-mr1Brian Muramatsu2011-12-142-4/+14
| | |\ \ \ \ \ \
| | | * | | | | | Build Support for CTS Native TestsBrian Muramatsu2011-12-132-4/+14
* | | | | | | | | x86: Refine the way we configure the x86 build.David 'Digit' Turner2011-12-143-27/+114
| |_|_|_|/ / / / |/| | | | | | |
* | | | | | | | am 4f732584: Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-130-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-130-0/+0
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | IML74DThe Android Automerger2011-12-131-1/+1
* | | | | | | | am 5b08f649: Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-130-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-130-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | IML74CThe Android Automerger2011-12-131-1/+1
| | * | | | | | IML74BThe Android Automerger2011-12-131-13/+3
| | * | | | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-130-0/+0
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | IML74The Android Automerger2011-12-131-13/+3
| | | * | | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-130-0/+0
| | | |\ \ \ \ \ | | |/ / / / / /
* | | | | | | | Merge "Add boot property enabling ADBD over QEMU"Vladimir Chtchetkine2011-12-133-3/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Add boot property enabling ADBD over QEMUVladimir Chtchetkine2011-12-133-3/+6
* | | | | | | | | Make java-event-log-tags.py create its output directory if it does not exist.Sean Dykeman2011-12-131-0/+5
* | | | | | | | | Merge "Allow to build Java module from mere static Java libraries."Ying Wang2011-12-133-5/+7
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Allow to build Java module from mere static Java libraries.Ying Wang2011-12-123-5/+7
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | am d2884199: Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-130-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-130-0/+0
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | IML73The Android Automerger2011-12-121-13/+3
| | * | | | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-120-0/+0
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
* | | | | | | | am a2c1261e: (-s ours) Set version numbers for AOSP - do not mergeJean-Baptiste Queru2011-12-120-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Set version numbers for AOSP - do not mergeJean-Baptiste Queru2011-12-122-3/+3
* | | | | | | | am 055cf585: am 615d2ffa: Enable the OpenGL View renderer on the emulatorJesse Hall2011-12-121-0/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / /