aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert "Revert "Merge 29e114d2 from master.""Xavier Ducrohet2011-03-181-0/+36
* merge from tools_r10The Android Open Source Project2011-03-181-36/+0
|\
| * Merge "Revert "Merge 29e114d2 from master. do not merge."" into tools_r10Xavier Ducrohet2011-03-181-36/+0
| |\
| | * Revert "Merge 29e114d2 from master. do not merge."Xavier Ducrohet2011-03-181-36/+0
| |/
* | merge from tools_r10The Android Open Source Project2011-03-180-0/+0
|\ \ | |/
| * Merge "Merge 29e114d2 from master. do not merge." into tools_r10Xavier Ducrohet2011-03-181-0/+36
| |\
| | * Merge 29e114d2 from master. do not merge.David 'Digit' Turner2011-03-181-0/+36
| |/
* | Merge "Fix touchscreen emulation to return correct min/max coordinate bounds."David 'Digit' Turner2011-03-181-0/+36
|\ \
| * | Fix touchscreen emulation to return correct min/max coordinate bounds.David 'Digit' Turner2011-03-181-0/+36
|/ /
* | Merge "Fix -shell and -logcat options."David 'Digit' Turner2011-03-171-1/+5
|\ \
| * | Fix -shell and -logcat options.David 'Digit' Turner2011-03-181-1/+5
|/ /
* | Merge "Fix write of disk sizes in ini files."David 'Digit' Turner2011-03-161-11/+14
|\ \
| * | Fix write of disk sizes in ini files.David 'Digit' Turner2011-03-151-11/+14
* | | Merge "Fix a crash that happened when the content directory didn't have a cac...David 'Digit' Turner2011-03-152-13/+24
|\ \ \ | |/ / |/| |
| * | Fix a crash that happened when the content directory didn't have a cache.img ...David 'Digit' Turner2011-03-152-13/+24
|/ /
* | Merge "Fix windows build when USE_CCACHE is defined."David 'Digit' Turner2011-03-141-0/+1
|\ \
| * | Fix windows build when USE_CCACHE is defined.David 'Digit' Turner2011-03-121-0/+1
|/ /
* | Merge "Improve emulator kernel rebuild script."David 'Digit' Turner2011-03-091-22/+86
|\ \
| * | Improve emulator kernel rebuild script.David 'Digit' Turner2011-03-091-22/+86
|/ /
* | Merge "Always prepend a space before kernel parameters."David 'Digit' Turner2011-03-081-0/+1
|\ \
| * | Always prepend a space before kernel parameters.David 'Digit' Turner2011-03-081-0/+1
|/ /
* | Merge "Add kernel-rebuilding script for the emulator."David 'Digit' Turner2011-03-082-1/+182
|\ \
| * | Add kernel-rebuilding script for the emulator.David 'Digit' Turner2011-03-052-1/+182
* | | Merge "x86: Enable KVM mode for Android x86 emulator (update/rebase)"David Turner2011-03-059-1/+1110
|\ \ \ | |/ / |/| |
| * | x86: Enable KVM mode for Android x86 emulator (update/rebase)Jun Nakajima2011-03-049-1/+1110
|/ /
* | Merge "look for the pc-bios files in the SDK tools/lib/pc-bios directory"David Turner2011-03-041-11/+19
|\ \
| * | look for the pc-bios files in the SDK tools/lib/pc-bios directoryBruce Beare2011-03-021-11/+19
|/ /
* | Merge "Fix the standalone emulator build."David 'Digit' Turner2011-03-023-2/+8
|\ \
| * | Fix the standalone emulator build.David 'Digit' Turner2011-03-023-2/+8
|/ /
* | Merge "qemu logging extensions"David Turner2011-03-026-42/+152
|\ \
| * | qemu logging extensionsrich cannings2011-03-016-42/+152
* | | Merge "Avoid redefining HOST_CC/CXX when building the emulator."David 'Digit' Turner2011-03-021-4/+5
|\ \ \ | |/ / |/| |
| * | Avoid redefining HOST_CC/CXX when building the emulator.David 'Digit' Turner2011-03-021-4/+5
|/ /
* | Merge "Move AVD name initialization to the core."David 'Digit' Turner2011-03-014-2/+24
|\ \
| * | Move AVD name initialization to the core.David 'Digit' Turner2011-03-014-2/+24
|/ /
* | Merge "Move some serial ports initialization to the core."David 'Digit' Turner2011-03-016-82/+117
|\ \
| * | Move some serial ports initialization to the core.David 'Digit' Turner2011-03-016-82/+117
* | | Merge "Move data partition initialization to core."David 'Digit' Turner2011-03-017-620/+116
|\ \ \ | |/ /
| * | Move data partition initialization to core.David 'Digit' Turner2011-03-017-620/+116
|/ /
* | Merge "Move system image initialization to core."David 'Digit' Turner2011-03-017-90/+225
|\ \
| * | Move system image initialization to core.David 'Digit' Turner2011-03-017-90/+225
* | | Merge "Move snapshot storage initialization to the core."David 'Digit' Turner2011-03-017-66/+104
|\ \ \ | |/ /
| * | Move snapshot storage initialization to the core.David 'Digit' Turner2011-03-017-66/+104
* | | Merge "Move the SD Card initialization to the core."David 'Digit' Turner2011-03-017-53/+95
|\ \ \ | |/ /
| * | Move the SD Card initialization to the core.David 'Digit' Turner2011-03-017-53/+95
* | | Merge "Move cache partition initialization to core."David 'Digit' Turner2011-03-016-55/+70
|\ \ \ | |/ /
| * | Move cache partition initialization to core.David 'Digit' Turner2011-03-016-55/+70
* | | Merge "Move kernel/ramdisk initialization to the core."David 'Digit' Turner2011-03-017-75/+124
|\ \ \ | |/ /
| * | Move kernel/ramdisk initialization to the core.David 'Digit' Turner2011-03-017-75/+124
* | | Merge "Rework AvdInfo processing."David 'Digit' Turner2011-03-015-575/+719
|\ \ \ | |/ /