aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge memory checking from sandboxVladimir Chtchetkine2010-02-1857-137/+12458
* am 720b75ff: (-s ours) am 6c77585b: Merge "Revert previous patch to fix SD Ca...David Turner2010-02-080-0/+0
|\
| * am 6c77585b: Merge "Revert previous patch to fix SD Card emulation - DO NOT M...David Turner2010-02-0518-538/+47
| |\
| | * Merge "Revert previous patch to fix SD Card emulation - DO NOT MERGE" into ec...David Turner2010-02-0518-538/+47
| | |\
| | | * Revert previous patch to fix SD Card emulation - DO NOT MERGEDavid 'Digit' Turner2010-02-0518-538/+47
* | | | am 30749bc2: am 09be4075: reconcile main tree with open-source eclairThe Android Open Source Project2010-02-050-0/+0
|\ \ \ \ | |/ / /
| * | | am 09be4075: reconcile main tree with open-source eclairThe Android Open Source Project2010-02-050-0/+0
| |\ \ \ | | |/ /
| | * | reconcile main tree with open-source eclairThe Android Open Source Project2010-02-050-0/+0
| | |\ \ | | | |/ | | |/|
| | | * reconcile android-2.1_r1 snapshotThe Android Open Source Project2010-01-290-0/+0
| | | |\
| | | | * android-2.1_r1 snapshotThe Android Open Source Project2010-01-1211-42/+403
* | | | | am d9b8b90d: merge from open-source masterThe Android Open Source Project2010-01-271-1/+10
|\ \ \ \ \ | |/ / / /
| * | | | merge from open-source masterThe Android Open Source Project2010-01-211-1/+10
| |\ \ \ \
| | * | | | Force gcc-4.0 for qemu build on Mac OS XKenny Root2009-11-151-1/+10
* | | | | | am 0edf6fb4: am 1cb37b34: Add new -sdcard2 <file> option. Add support for Fre...David 'Digit' Turner2010-01-081-0/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 1cb37b34: Add new -sdcard2 <file> option. Add support for FreeBSD in the s...David 'Digit' Turner2010-01-0812-45/+376
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Add new -sdcard2 <file> option.David 'Digit' Turner2010-01-0718-47/+538
* | | | | | am 538b0138: am c973b058: Add support to the emulator\'s standalone build sys...David 'Digit' Turner2010-01-073-0/+26
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am c973b058: Add support to the emulator\'s standalone build system for C++ s...David 'Digit' Turner2010-01-073-0/+26
| |\ \ \ \ \ | | |/ / / /
| | * | | | Add support to the emulator's standalone build system for C++ sources.David 'Digit' Turner2010-01-073-0/+26
| | | |/ / | | |/| |
* | | | | Merge commit 'goog/eclair-plus-aosp'Android Git Automerger2009-12-150-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | am 39fd8497: Add two documentation files describing the format of config and ...David 'Digit' Turner2009-12-073-31/+325
| |\ \ \ \ | | |/ / /
| * | | | am a383d02c: Extract emulator major version number from SDK Tools package rev...David 'Digit' Turner2009-12-035-6/+40
| |\ \ \ \
| * \ \ \ \ am 8b657e5d: Fix a crash when using an 8MB SD Card image file.David 'Digit' Turner2009-12-014-6/+39
| |\ \ \ \ \
| * \ \ \ \ \ am 5bc6182a: Fix location of prebuilt skins.Xavier Ducrohet2009-11-202-2/+2
| |\ \ \ \ \ \
* | \ \ \ \ \ \ am 7e7e1732: am e3c94626: am 39fd8497: Add two documentation files describing...David 'Digit' Turner2009-12-103-31/+325
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ am e3c94626: am 39fd8497: Add two documentation files describing the format o...David 'Digit' Turner2009-12-093-31/+325
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ am 39fd8497: Add two documentation files describing the format of config and ...David 'Digit' Turner2009-12-073-31/+325
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | |
| | | * | | | | | | Add two documentation files describing the format of config and skin files.David 'Digit' Turner2009-12-073-31/+325
| | | | |_|_|/ / / | | | |/| | | | |
* | | | | | | | | am 0bf9b8b2: am 71e736ef: qemu: android: Add control console support for mana...San Mehat2009-12-103-6/+149
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 71e736ef: qemu: android: Add control console support for managing sdcardsSan Mehat2009-12-093-6/+149
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | qemu: android: Add control console support for managing sdcardsSan Mehat2009-12-073-6/+149
* | | | | | | | | am 76ae1ea0: am 7ab6d35b: qemu: android: Add support for hot-adding disks as ...San Mehat2009-12-102-1/+47
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 7ab6d35b: qemu: android: Add support for hot-adding disks as well as swapp...San Mehat2009-12-092-1/+47
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | qemu: android: Add support for hot-adding disks as well as swapping image filesSan Mehat2009-12-072-1/+47
* | | | | | | | | am b3e7ebed: am 68a8f7b5: qemu: android: Add support for multiple SD cardsSan Mehat2009-12-078-44/+183
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 68a8f7b5: qemu: android: Add support for multiple SD cardsSan Mehat2009-12-078-44/+183
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | qemu: android: Add support for multiple SD cardsSan Mehat2009-12-078-44/+183
* | | | | | | | | am 51e8424b: am dc3dd741: am a383d02c: Extract emulator major version number ...David 'Digit' Turner2009-12-045-6/+40
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am dc3dd741: am a383d02c: Extract emulator major version number from SDK Tool...David 'Digit' Turner2009-12-035-6/+40
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am a383d02c: Extract emulator major version number from SDK Tools package rev...David 'Digit' Turner2009-12-035-6/+40
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Extract emulator major version number from SDK Tools package revision.David 'Digit' Turner2009-12-035-6/+40
| | | | |_|/ / / | | | |/| | | |
* | | | | | | | am ae4812d7: am 1c657d48: am 8b657e5d: Fix a crash when using an 8MB SD Card ...David 'Digit' Turner2009-12-024-6/+39
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 1c657d48: am 8b657e5d: Fix a crash when using an 8MB SD Card image file.David 'Digit' Turner2009-12-024-6/+39
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am 8b657e5d: Fix a crash when using an 8MB SD Card image file.David 'Digit' Turner2009-12-024-6/+39
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Fix a crash when using an 8MB SD Card image file.David 'Digit' Turner2009-12-014-6/+39
| | | | |/ / / | | | |/| | |
* | | | | | | am 01523298: am 70dc4cbc: am 5bc6182a: Fix location of prebuilt skins.Xavier Ducrohet2009-11-202-2/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 70dc4cbc: am 5bc6182a: Fix location of prebuilt skins.Xavier Ducrohet2009-11-202-2/+2
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 5bc6182a: Fix location of prebuilt skins.Xavier Ducrohet2009-11-202-2/+2
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Fix location of prebuilt skins.Xavier Ducrohet2009-11-202-2/+2
* | | | | | | am abe0c58f: merge from open-source masterJean-Baptiste Queru2009-11-150-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /