aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add env var ANDROID_TMP to override /tmp/android location.Raphael2010-11-162-2/+5
* Merge "Fix build break"Vladimir Chtchetkine2010-11-161-0/+1
|\
| * Fix build breakVladimir Chtchetkine2010-11-161-0/+1
|/
* Merge "Implement absoule wait in iolooper"Vladimir Chtchetkine2010-11-162-0/+54
|\
| * Implement absoule wait in iolooperVladimir Chtchetkine2010-11-162-0/+54
* | merge from tools_r8The Android Open Source Project2010-11-150-0/+0
|\ \ | |/ |/|
| * Merge "Integrate 80bc5c8c into tools_r8. DO NOT MERGE." into tools_r8Xavier Ducrohet2010-11-157-27/+79
| |\
| | * Integrate 80bc5c8c into tools_r8. DO NOT MERGE.David 'Digit' Turner2010-11-127-27/+79
| |/
* | Merge "Implement -list-cores UI option"Vladimir Chtchetkine2010-11-105-3/+163
|\ \
| * | Implement -list-cores UI optionVladimir Chtchetkine2010-11-105-3/+163
|/ /
* | Merge "Add command line flag to show list of snapshots."David Turner2010-10-286-3/+394
|\ \
| * | Add command line flag to show list of snapshots.Ot ten Thije2010-10-286-3/+394
* | | Merge "Control state snapshots from Android console."David Turner2010-10-288-44/+303
|\ \ \ | |/ /
| * | Control state snapshots from Android console.Ot ten Thije2010-10-288-44/+303
|/ /
* | merge from tools_r8The Android Open Source Project2010-10-270-0/+0
|\ \ | |/
| * Merge "Cherry pick 631f2555 into tools_r8. DO NOT MERGE." into tools_r8Xavier Ducrohet2010-10-271-2/+2
| |\
| | * Cherry pick 631f2555 into tools_r8. DO NOT MERGE.David 'Digit' Turner2010-10-261-2/+2
| |/
* | Merge "Fix invalid "geo fix" formatting bug."David 'Digit' Turner2010-10-261-2/+2
|\ \
| * | Fix invalid "geo fix" formatting bug.David 'Digit' Turner2010-10-271-2/+2
* | | Merge "Allow OS X emulator to open host /dev/ devices."David 'Digit' Turner2010-10-262-9/+4
|\ \ \ | |/ / |/| |
| * | Allow OS X emulator to open host /dev/ devices.David 'Digit' Turner2010-10-272-9/+4
* | | Merge "Fix emulator build."Jean-Baptiste Queru2010-10-221-1/+1
|\ \ \
| * | | Fix emulator build.Jean-Baptiste Queru2010-10-221-1/+1
|/ / /
* | | Merge "Fix ping version reporting."David 'Digit' Turner2010-10-221-20/+22
|\ \ \
| * | | Fix ping version reporting.David 'Digit' Turner2010-10-231-20/+22
| |/ /
* | | Merge "Load state snapshot rather than booting to start emulator."Ot ten Thije2010-10-226-35/+219
|\ \ \
| * | | Load state snapshot rather than booting to start emulator.Ot ten Thije2010-10-226-35/+219
|/ / /
* | | Merge "Added state snapshot support for QemuD service "boot properties"."Ot ten Thije2010-10-211-19/+177
|\ \ \ | |/ / |/| |
| * | Added state snapshot support for QemuD service "boot properties".Ot ten Thije2010-10-211-19/+177
* | | Merge "Fix linux-x86_64 build."David 'Digit' Turner2010-10-2119-44/+165
|\ \ \
| * | | Fix linux-x86_64 build.David 'Digit' Turner2010-10-2119-44/+165
* | | | Merge "Make state snapshots compatible with SD cards."Ot ten Thije2010-10-213-22/+16
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Make state snapshots compatible with SD cards.Ot ten Thije2010-10-213-22/+16
|/ /
* | Merge "Fix incorrect orientation at boot."David 'Digit' Turner2010-10-207-27/+79
|\ \
| * | Fix incorrect orientation at boot.David 'Digit' Turner2010-10-207-27/+79
|/ /
* | emulator-ui: Remove dependencies from qemu sources.David 'Digit' Turner2010-10-1912-716/+72
|/
* Fix windows event loop handling.David 'Digit' Turner2010-10-184-57/+46
* Merge "Added state snapshot support for QemuD."David Turner2010-10-159-49/+719
|\
| * Added state snapshot support for QemuD.Ot ten Thije2010-10-149-49/+719
* | standalone builds: windows executables end in .exeDavid 'Digit' Turner2010-10-142-3/+13
|/
* Merge "Permanent fix for workaround of timer issue (commit a7f114bc)."Ot ten Thije2010-10-141-2/+1
|\
| * Permanent fix for workaround of timer issue (commit a7f114bc).Ot ten Thije2010-09-241-2/+1
* | Merge "Save NAND disk state in snapshots."Ot ten Thije2010-10-141-45/+206
|\ \
| * | Save NAND disk state in snapshots.Ot ten Thije2010-10-131-45/+206
* | | Merge "emulator-ui: Fix windows build (behaviour not tested)"David 'Digit' Turner2010-10-131-0/+11
|\ \ \
| * | | emulator-ui: Fix windows build (behaviour not tested)David 'Digit' Turner2010-10-131-0/+11
* | | | Merge "emulator-ui: fix crash on exit"David 'Digit' Turner2010-10-135-17/+14
|\ \ \ \ | |/ / /
| * | | emulator-ui: fix crash on exitDavid 'Digit' Turner2010-10-135-17/+14
| |/ /
* | | Merge changes Ieab04778,Idb0e3c52,I3f426352,Ied07f9dbDavid Turner2010-10-134-2/+150
|\ \ \ | |/ / |/| |
| * | Don't build MMX stuff on PowerPCMarcus Comstedt2010-10-051-1/+5