summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 03e2f8fa: Merge "Modified atrace.cpp to recognize ATRACE_TAG_BIONIC."Elliott Hughes2014-05-291-0/+1
|\
| * Merge "Modified atrace.cpp to recognize ATRACE_TAG_BIONIC."Elliott Hughes2014-05-291-0/+1
| |\
| | * Modified atrace.cpp to recognize ATRACE_TAG_BIONIC.Brigid Smith2014-05-281-0/+1
* | | am 97a51ad4: Merge "Move to dalvik.vm.lib.2 to force default to libart"Brian Carlstrom2014-05-281-1/+1
|\ \ \ | |/ /
| * | Merge "Move to dalvik.vm.lib.2 to force default to libart"Brian Carlstrom2014-05-281-1/+1
| |\ \ | | |/ | |/|
| | * Move to dalvik.vm.lib.2 to force default to libartBrian Carlstrom2014-05-281-1/+1
| |/
* | am dc273621: Merge "EGL: add x86/64 assembly code for EGL/GLES wrappers"Jesse Hall2014-05-273-0/+121
|\ \ | |/
| * Merge "EGL: add x86/64 assembly code for EGL/GLES wrappers"Jesse Hall2014-05-273-0/+121
| |\
| | * EGL: add x86/64 assembly code for EGL/GLES wrappersmwajdecz2014-05-273-0/+121
| |/
* | am c9fcaf37: Merge "Change InputMessage.motion.pointerSize to a uint32_t."Narayan Kamath2014-05-162-11/+11
|\ \ | |/
| * Merge "Change InputMessage.motion.pointerSize to a uint32_t."Narayan Kamath2014-05-162-11/+11
| |\
| | * Change InputMessage.motion.pointerSize to a uint32_t.Narayan Kamath2014-05-162-11/+11
| |/
* | am b66ee6c3: Merge "Ensure that app lib symlinks are correctly labeled when c...Nick Kralevich2014-05-131-14/+14
|\ \ | |/
| * Merge "Ensure that app lib symlinks are correctly labeled when created."Nick Kralevich2014-05-131-14/+14
| |\
| | * Ensure that app lib symlinks are correctly labeled when created.Stephen Smalley2014-05-131-14/+14
| |/
* | am bd20e551: Merge "Use asynchronous lock/unlock API"Greg Hackmann2014-05-125-13/+126
|\ \ | |/
| * Merge "Use asynchronous lock/unlock API"Greg Hackmann2014-05-125-13/+126
| |\
| | * Use asynchronous lock/unlock APIFrancis Hart2014-05-125-13/+126
| |/
* | am a9d49f99: Merge "Revert "Use asynchronous lock/unlock API""Greg Hackmann2014-05-095-126/+13
|\ \ | |/
| * Merge "Revert "Use asynchronous lock/unlock API""Greg Hackmann2014-05-095-126/+13
| |\
| | * Revert "Use asynchronous lock/unlock API"Greg Hackmann2014-05-095-126/+13
* | | am f60564a1: Merge "Use asynchronous lock/unlock API"Greg Hackmann2014-05-095-13/+126
|\ \ \ | |/ /
| * | Merge "Use asynchronous lock/unlock API"Greg Hackmann2014-05-095-13/+126
| |\ \ | | |/
| | * Use asynchronous lock/unlock APIFrancis Hart2014-05-025-13/+126
* | | am 8155ce81: Merge "Remove unused LOCAL_LDLIBS."Ying Wang2014-05-073-8/+0
|\ \ \ | |/ /
| * | Merge "Remove unused LOCAL_LDLIBS."Ying Wang2014-05-073-8/+0
| |\ \
| | * | Remove unused LOCAL_LDLIBS.Ying Wang2014-05-073-8/+0
| |/ /
* | | am ef923fcf: Merge "fix GraphicBuffer::flatten crash issue when handle is null"Jesse Hall2014-05-051-2/+4
|\ \ \ | |/ /
| * | Merge "fix GraphicBuffer::flatten crash issue when handle is null"Jesse Hall2014-05-051-2/+4
| |\ \
| | * | fix GraphicBuffer::flatten crash issue when handle is nullJun Jiang2014-04-291-2/+4
* | | | am 70278fbf: Merge "Add error message for hints when exceptions occur during ...Jesse Hall2014-05-051-1/+6
|\ \ \ \ | |/ / /
| * | | Merge "Add error message for hints when exceptions occur during binder transa...Jesse Hall2014-05-051-1/+6
| |\ \ \ | | |_|/ | |/| |
| | * | Add error message for hints when exceptions occur during binder transactions.Jun Jiang2014-04-291-1/+6
| | |/
* | | am cb079c89: Merge "Add instruction-set arguments to installd commands."Narayan Kamath2014-05-013-35/+49
|\ \ \ | |/ /
| * | Merge "Add instruction-set arguments to installd commands."Narayan Kamath2014-05-013-35/+49
| |\ \ | | |/ | |/|
| | * Add instruction-set arguments to installd commands.Narayan Kamath2014-05-013-35/+49
| |/
* | Merge commit '6d05ef2310bdc84811d5b0385b009ad11447a749' into HEADBill Yi2014-04-297-31/+39
|\ \ | |/ |/|
| * am 9c7db080: Build the benchmark test to /data/local/tmp/ for automated testXia Wang2014-03-241-0/+3
| |\
| | * Build the benchmark test to /data/local/tmp/ for automated testXia Wang2014-03-241-0/+3
| * | am 897fe45c: am 23c2fcbb: (-s ours) am c0af9caf: am b14d72bc: am d070009e: am...Marco Nelissen2014-03-200-0/+0
| |\ \ | | |/
| | * am 23c2fcbb: (-s ours) am c0af9caf: am b14d72bc: am d070009e: am df6774c9: am...Marco Nelissen2014-03-200-0/+0
| | |\
| | | * am c0af9caf: am b14d72bc: am d070009e: am df6774c9: am 7c1cdbdd: am e23f8b8f:...Marco Nelissen2014-03-202-0/+12
| | | |\
| | | | * am b14d72bc: am d070009e: am df6774c9: am 7c1cdbdd: am e23f8b8f: am 1f70863d:...Marco Nelissen2014-03-202-0/+12
| | | | |\
| | | | | * am d070009e: am df6774c9: am 7c1cdbdd: am e23f8b8f: am 1f70863d: am 37b44969:...Marco Nelissen2014-03-202-0/+12
| | | | | |\
| | | | | | * am df6774c9: am 7c1cdbdd: am e23f8b8f: am 1f70863d: am 37b44969: Add support ...Marco Nelissen2014-03-202-0/+12
| | | | | | |\
| | | | | | | * am 7c1cdbdd: am e23f8b8f: am 1f70863d: am 37b44969: Add support for writing b...Marco Nelissen2014-03-202-0/+12
| | | | | | | |\
| | | | | | | | * am e23f8b8f: am 1f70863d: am 37b44969: Add support for writing byte arrays to...Marco Nelissen2014-03-202-0/+12
| | | | | | | | |\
| | | | | | | | | * am 1f70863d: am 37b44969: Add support for writing byte arrays to parcelsMarco Nelissen2014-03-202-0/+12
| | | | | | | | | |\
| | | | | | | | | | * am 37b44969: Add support for writing byte arrays to parcelsMarco Nelissen2014-03-202-0/+12
| | | | | | | | | | |\
| | | | | | | | | | | * Add support for writing byte arrays to parcelsMarco Nelissen2014-03-172-0/+12