summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "installd: change profile files to 0660"Nick Kralevich2014-06-101-29/+6
|\
| * installd: change profile files to 0660Nick Kralevich2014-06-121-29/+6
|/
* Merge "Add SELinux checks when adding a service."Nick Kralevich2014-06-122-7/+85
|\
| * Add SELinux checks when adding a service.Riley Spahn2014-06-122-7/+85
* | Merge "sensorservice: 64-bit compile issues"Mark Salyzyn2014-06-122-17/+20
|\ \ | |/ |/|
| * sensorservice: 64-bit compile issuesMark Salyzyn2014-06-102-17/+20
* | Merge "Pass --top-k-profile-threshold to dex2oat if available."Calin Juravle2014-06-101-16/+38
|\ \ | |/ |/|
| * Pass --top-k-profile-threshold to dex2oat if available.Calin Juravle2014-06-101-16/+38
* | Merge "Don't set LOCAL_MODULE_PATH for native tests."Ying Wang2014-06-091-4/+0
|\ \
| * | Don't set LOCAL_MODULE_PATH for native tests.Ying Wang2014-06-091-4/+0
* | | Merge "libgui: 64-bit compile issues"Mark Salyzyn2014-06-092-4/+6
|\ \ \ | |/ / |/| |
| * | libgui: 64-bit compile issuesMark Salyzyn2014-06-092-4/+6
|/ /
* | Merge "Migrate keychain directories to /data/misc/user/0"Robin Lee2014-06-091-5/+29
|\ \
| * | Migrate keychain directories to /data/misc/user/0Robin Lee2014-06-051-5/+29
* | | Merge "Don't always add profile-file option to dex2oat"Calin Juravle2014-06-091-2/+14
|\ \ \ | | |/ | |/|
| * | Don't always add profile-file option to dex2oatCalin Juravle2014-06-061-2/+14
* | | Merge "Add aarch64 EGL/GLES trampolines"Jesse Hall2014-06-063-27/+83
|\ \ \ | |/ / |/| |
| * | Add aarch64 EGL/GLES trampolinesJesse Hall2014-06-063-27/+83
|/ /
* | Merge "Fix flattening/unflattening of android::Sensor."Narayan Kamath2014-06-061-6/+6
|\ \ | |/ |/|
| * Fix flattening/unflattening of android::Sensor.Narayan Kamath2014-05-301-6/+6
* | Merge "Add installd command to create /data/misc user dir"Robin Lee2014-06-054-10/+97
|\ \
| * | Add installd command to create /data/misc user dirRobin Lee2014-06-054-10/+97
|/ /
* | Merge "Fix mips build for libbinder."Narayan Kamath2014-06-041-0/+1
|\ \
| * | Fix mips build for libbinder.Narayan Kamath2014-06-041-0/+1
* | | Merge "binder: Turn on -Werror"Mark Salyzyn2014-06-033-68/+70
|\ \ \ | |/ / |/| |
| * | binder: Turn on -WerrorMark Salyzyn2014-06-033-68/+70
|/ /
* | Merge "x86_64: Align uint64_t/int64_t structure member to 8 bytes"Narayan Kamath2014-06-034-8/+94
|\ \
| * | x86_64: Align uint64_t/int64_t structure member to 8 bytesFengwei Yin2014-05-304-8/+94
| |/
* | am 63645c69: Merge "binder: rm utils/Debug.h"Mark Salyzyn2014-05-295-5/+0
|\ \ | |/
| * Merge "binder: rm utils/Debug.h"Mark Salyzyn2014-05-295-5/+0
| |\
| | * binder: rm utils/Debug.hMark Salyzyn2014-05-295-5/+0
| |/
* | am f3e4fda0: Merge "Remove dependencies on runtime_libdvm and libdvm.so in ge...Brian Carlstrom2014-05-291-6/+9
|\ \ | |/
| * Merge "Remove dependencies on runtime_libdvm and libdvm.so in general"Brian Carlstrom2014-05-291-6/+9
| |\
| | * Remove dependencies on runtime_libdvm and libdvm.so in generalBrian Carlstrom2014-05-291-6/+9
| |/
* | 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
|\ \ | |/