aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Fix Mac and Windows builds."David 'Digit' Turner2011-05-251-0/+3
|\
| * Fix Mac and Windows builds.David 'Digit' Turner2011-05-261-0/+3
|/
* Merge "x86: kvm: fix KVM build + enable auto-detection."David 'Digit' Turner2011-05-2512-13/+2033
|\
| * x86: kvm: fix KVM build + enable auto-detection.David 'Digit' Turner2011-05-2612-13/+2033
|/
* Merge "fix audio backend handling"David 'Digit' Turner2011-05-241-0/+3
|\
| * fix audio backend handlingDavid 'Digit' Turner2011-05-211-0/+3
* | Reconcile with honeycomb-mr1-releaseThe Android Open Source Project2011-05-200-0/+0
|\ \ | |/ |/|
| * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-05-070-0/+0
| |\
| | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-05-050-0/+0
| | |\ | |/ /
| | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-05-050-0/+0
| | |\ | |/ /
| | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-05-040-0/+0
| | |\
| | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-05-030-0/+0
| | | |\
| | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-290-0/+0
| | | | |\
| | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-280-0/+0
| | | | | |\
| | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-270-0/+0
| | | | | | |\
| | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-250-0/+0
| | | | | | | |\
| | | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-210-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-190-0/+0
| | | | | | | | | |\ | | | | | | | | |/ /
| | | | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-150-0/+0
| | | | | | | | | |\ | | | | | | | | |/ /
| | | | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-130-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-070-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-070-0/+0
| | | | | | | | | | | |\ | | | | | | | | | | |/ /
| | | | | | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-050-0/+0
| | | | | | | | | | | |\ | | | | | | | | | | |/ /
| | | | | | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-040-0/+0
| | | | | | | | | | | |\ | | | | | | | | | | |/ /
| | | | | | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-010-0/+0
| | | | | | | | | | | |\ | | | | | | | | | | |/ /
| | | | | | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-310-0/+0
| | | | | | | | | | | |\ | | | | | | | | | | |/ /
| | | | | | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-280-0/+0
| | | | | | | | | | | |\ | | | | | | | | | | |/ /
| | | | | | | | | | | * keep previous historyThe Android Automerger2011-03-250-0/+0
| | | | | | | | | | | |\ | | | | | | | | | | |/ /
| | | | | | | | | | | * keep previous historyThe Android Automerger2011-03-250-0/+0
| | | | | | | | | | | |\ | | | | | | | | | | | |/ | | | | | | | | | | |/|
* | | | | | | | | | | | Merge "Add support for xhdpi when injecting a skin dpi into the emulator."David Turner2011-05-172-8/+11
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add support for xhdpi when injecting a skin dpi into the emulator.Xavier Ducrohet2011-05-172-8/+11
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge "Dump hardware config. with -verbose option."David 'Digit' Turner2011-05-164-0/+321
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Dump hardware config. with -verbose option.David 'Digit' Turner2011-05-144-0/+321
* | | | | | | | | | | | | Merge "Fix the pc-bios search path for build trees."David 'Digit' Turner2011-05-151-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Fix the pc-bios search path for build trees.David 'Digit' Turner2011-05-141-2/+2
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge "Fix SDCard speed issues too."David 'Digit' Turner2011-05-121-4/+8
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix SDCard speed issues too.David 'Digit' Turner2011-05-121-4/+8
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge "console: Fix 'event send' handling."David 'Digit' Turner2011-05-102-4/+10
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | console: Fix 'event send' handling.David 'Digit' Turner2011-05-092-4/+10
|/ / / / / / / / / / /
* | | | | | | | | | | Merge "Fix -snapshot-list option."David 'Digit' Turner2011-05-052-1/+16
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix -snapshot-list option.David 'Digit' Turner2011-05-052-1/+16
* | | | | | | | | | | | Merge "Fix emulator audio."David 'Digit' Turner2011-05-051-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix emulator audio.David 'Digit' Turner2011-05-051-0/+3
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge "Fix "avd name" bug."David 'Digit' Turner2011-05-051-4/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix "avd name" bug.David 'Digit' Turner2011-05-051-4/+1
|/ / / / / / / / / / /
* | | | | | | | | | | merge from tools_r11The Android Open Source Project2011-05-040-0/+0
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge "Merge "Fix ANDROID_SDK_HOME handling."" into tools_r11Raphaƫl Moll2011-05-041-12/+5
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Merge "Fix ANDROID_SDK_HOME handling."David 'Digit' Turner2011-05-041-12/+5
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge "Fix ANDROID_SDK_HOME handling."David 'Digit' Turner2011-05-041-12/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix ANDROID_SDK_HOME handling.David 'Digit' Turner2011-05-041-12/+5