aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Add 'emulator' launcher program." into tools_r11David 'Digit' Turner2011-05-0312-229/+694
|\
| * Add 'emulator' launcher program.David 'Digit' Turner2011-05-0312-229/+694
|/
* reconcile tools_r10 into master - no actual changeThe Android Open Source Project2011-04-210-0/+0
|\
| * Merge "Fix touch emulation for tools_r10 emulator." into tools_r10David 'Digit' Turner2011-03-213-0/+36
| |\
| | * Fix touch emulation for tools_r10 emulator.David 'Digit' Turner2011-03-213-0/+36
| |/
| * Merge "Fix touchscreen emulation to return correct min/max coordinate bounds....David 'Digit' Turner2011-03-181-0/+40
| |\
| | * Fix touchscreen emulation to return correct min/max coordinate bounds. DO NOT...David 'Digit' Turner2011-03-181-0/+40
| |/
* | Merge "Add support for hw.lcd.backlight"David Turner2011-04-153-1/+18
|\ \
| * | Add support for hw.lcd.backlightTim Wan2011-04-153-1/+18
|/ /
* | Merge "Converted a variable from char * to const char *. Removes compiler war...David Turner2011-04-111-2/+2
|\ \
| * | Converted a variable from char * to const char *.Ashish Bhatia2011-04-081-2/+2
* | | Merge "vl-android.c: Init opengles pipe on startup"David 'Digit' Turner2011-04-111-0/+4
|\ \ \
| * | | vl-android.c: Init opengles pipe on startupDavid 'Digit' Turner2011-04-111-0/+4
* | | | Merge "hw/android_arm.c: Initialize qemud pipes properly."David 'Digit' Turner2011-04-111-0/+4
|\ \ \ \ | |/ / /
| * | | hw/android_arm.c: Initialize qemud pipes properly.David 'Digit' Turner2011-04-111-0/+4
* | | | Merge "Add OpenGLES pipe implementation."David 'Digit' Turner2011-04-112-0/+789
|\ \ \ \ | |/ / /
| * | | Add OpenGLES pipe implementation.David 'Digit' Turner2011-04-112-0/+789
* | | | Merge "goldfish_trace: Hook with goldfish_pipe.h functions."David 'Digit' Turner2011-04-113-36/+102
|\ \ \ \ | |/ / /
| * | | goldfish_trace: Hook with goldfish_pipe.h functions.David 'Digit' Turner2011-04-113-36/+102
* | | | Merge "hw/goldfish_pipe.c: New support code for QEMUD fast-pipes."David 'Digit' Turner2011-04-113-0/+839
|\ \ \ \ | |/ / /
| * | | hw/goldfish_pipe.c: New support code for QEMUD fast-pipes.David 'Digit' Turner2011-04-113-0/+839
* | | | Merge "qemud: prevent recursive closure of clients."David 'Digit' Turner2011-04-113-8/+36
|\ \ \ \ | |/ / /
| * | | qemud: prevent recursive closure of clients.David 'Digit' Turner2011-04-113-8/+36
|/ / /
* | | Merge "Simplify async utils by removing extra LoopIo parameter."David 'Digit' Turner2011-04-1110-49/+76
|\ \ \
| * | | Simplify async utils by removing extra LoopIo parameter.David 'Digit' Turner2011-04-1110-49/+76
* | | | Merge "<android/utils/assert.h>: Small refactoring"David 'Digit' Turner2011-04-111-23/+73
|\ \ \ \ | |/ / /
| * | | <android/utils/assert.h>: Small refactoringDavid 'Digit' Turner2011-04-111-23/+73
* | | | Merge "Add <android/utils/intmap.h> which implements an integer-keyed map of ...David 'Digit' Turner2011-04-113-0/+334
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Add <android/utils/intmap.h> which implements an integer-keyed map of pointers.David 'Digit' Turner2011-04-113-0/+334
|/ /
* | Merge "Fix framebuffer width/height computation."David 'Digit' Turner2011-03-251-2/+2
|\ \
| * | Fix framebuffer width/height computation.David 'Digit' Turner2011-03-251-2/+2
|/ /
* | Merge "Set hw.keyboard.lid default value to false for API level >= 12"David 'Digit' Turner2011-03-237-60/+291
|\ \
| * | Set hw.keyboard.lid default value to false for API level >= 12David 'Digit' Turner2011-03-227-60/+291
|/ /
* | Merge "Revert "Revert "Merge 29e114d2 from master."""Xavier Ducrohet2011-03-181-0/+36
|\ \
| * | 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
|\ \