summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 06ed9491: Merge "Fix parameter ordering for installd\'s dex2oat execl."Anwar Ghuloum2014-03-131-1/+1
|\
| * Merge "Fix parameter ordering for installd's dex2oat execl."Anwar Ghuloum2014-03-111-1/+1
| |\
| | * Fix parameter ordering for installd's dex2oat execl.Anwar Ghuloum2014-03-111-1/+1
| |/
* | am 1649c77e: Merge "ART profiler"Dave Allison2014-03-114-37/+112
|\ \ | |/
| * Merge "ART profiler"Dave Allison2014-03-074-37/+112
| |\
| | * ART profilerDave Allison2014-03-074-37/+112
* | | am 112aa42e: Merge "SurfaceFlinger: fix 64-bit format string warnings"Greg Hackmann2014-03-114-9/+12
|\ \ \ | |/ /
| * | Merge "SurfaceFlinger: fix 64-bit format string warnings"Greg Hackmann2014-03-074-9/+12
| |\ \ | | |/ | |/|
| | * SurfaceFlinger: fix 64-bit format string warningsGreg Hackmann2014-03-074-9/+12
* | | am 3c39e03c: Merge "Don\'t pass in empty arg to dex2oat."Mathieu Chartier2014-03-111-1/+1
|\ \ \ | |/ /
| * | Merge "Don't pass in empty arg to dex2oat."Mathieu Chartier2014-03-061-1/+1
| |\ \
| | * | Don't pass in empty arg to dex2oat.Mathieu Chartier2014-03-051-1/+1
| |/ /
* | | am e19c99aa: Merge "Add dalvik.vm.dex2oat-flags to mimic dalvik.vm.dexopt-flags"Brian Carlstrom2014-03-111-10/+15
|\ \ \ | |/ /
| * | Merge "Add dalvik.vm.dex2oat-flags to mimic dalvik.vm.dexopt-flags"Brian Carlstrom2014-03-051-10/+15
| |\ \
| | * | Add dalvik.vm.dex2oat-flags to mimic dalvik.vm.dexopt-flagsBrian Carlstrom2014-03-041-10/+15
| |/ /
* | | am 462fb3a8: Merge "gui: Fix return code assert in CpuConsumer_test."Igor Murashkin2014-03-111-1/+1
|\ \ \ | |/ /
| * | Merge "gui: Fix return code assert in CpuConsumer_test."Igor Murashkin2014-03-041-1/+1
| |\ \
| | * | gui: Fix return code assert in CpuConsumer_test.Alistair Strachan2013-12-041-1/+1
* | | | am 61d6a008: Merge "hwc test: 64-bit compilation error"Mark Salyzyn2014-03-111-2/+2
|\ \ \ \ | |/ / /
| * | | Merge "hwc test: 64-bit compilation error"Mark Salyzyn2014-03-041-2/+2
| |\ \ \
| | * | | hwc test: 64-bit compilation errorMark Salyzyn2014-03-041-2/+2
| |/ / /
* | | | am 6b4e5b7f: Merge "Fix misuse of ."Ying Wang2014-03-111-2/+0
|\ \ \ \ | |/ / /
| * | | Merge "Fix misuse of $(my-dir)."Ying Wang2014-03-011-2/+0
| |\ \ \
| | * | | Fix misuse of $(my-dir).Ying Wang2014-02-281-2/+0
| |/ / /
* | | | am b98c4761: Merge "Correcting include path in installd test project\'s Andro...Narayan Kamath2014-03-111-1/+1
|\ \ \ \ | |/ / /
| * | | Merge "Correcting include path in installd test project's Android.mk"Narayan Kamath2014-02-281-1/+1
| |\ \ \
| | * | | Correcting include path in installd test project's Android.mkRamin Zaghi2014-02-281-1/+1
| |/ / /
* | | | am 93e6a48b: Merge "AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DIS...Narayan Kamath2014-03-112-3/+2
|\ \ \ \ | |/ / /
| * | | Merge "AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY"Narayan Kamath2014-02-272-3/+2
| |\ \ \ | | |_|/ | |/| |
| | * | AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAYAshok Bhat2014-02-262-3/+2
| |/ /
* | | am c9bf3ba4: Merge "Virtual Display async mode is overridden"Jesse Hall2014-03-111-10/+10
|\ \ \ | |/ /
| * | Merge "Virtual Display async mode is overridden"Jesse Hall2014-02-251-10/+10
| |\ \
| | * | Virtual Display async mode is overriddenJohn Dong2014-02-211-10/+10
* | | | am aaa27fd5: Merge "Use reinterpret_cast when an integer is cast to a pointer"Narayan Kamath2014-03-116-6/+8
|\ \ \ \ | |/ / /
| * | | Merge "Use reinterpret_cast when an integer is cast to a pointer"Narayan Kamath2014-02-256-6/+8
| |\ \ \
| | * | | Use reinterpret_cast when an integer is cast to a pointerAshok Bhat2014-02-246-6/+8
* | | | | am e5c99bf3: Merge "Use long for pointers in opengl/EGL classes"Narayan Kamath2014-03-1114-40/+203
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Use long for pointers in opengl/EGL classes"Narayan Kamath2014-02-2514-40/+203
| |\ \ \ \
| | * | | | Use long for pointers in opengl/EGL classesAshok Bhat2014-02-2414-40/+203
| | |/ / /
* | | | | am ead79b83: (-s ours) Merge "Binder: Make sure binder objects do not overlap"Arve Hjønnevåg2014-03-110-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Binder: Make sure binder objects do not overlap"Arve Hjønnevåg2014-02-251-0/+12
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Binder: Make sure binder objects do not overlapArve Hjønnevåg2014-02-241-0/+12
| |/ / /
* | | | am d1c87d37: Merge changes I3432d9d3,I90fcf538,I64398603Arve Hjønnevåg2014-03-102-1/+11
|\ \ \ \ | |/ / /
| * | | Merge changes I3432d9d3,I90fcf538,I64398603Arve Hjønnevåg2014-02-212-1/+11
| |\ \ \ | | |/ / | |/| |
| | * | Binder: Fix some valgrind errors.Arve Hjønnevåg2014-02-182-0/+4
| | * | Binder: Don't cast directly from a pointer to binder_uintptr_tArve Hjønnevåg2014-02-181-1/+1
| | * | Binder: Disable attemptIncStrongHandleArve Hjønnevåg2014-02-141-0/+6
* | | | am 9076fa78: Merge "Update EGL codegen to be in sync with frameworks/base"Narayan Kamath2014-03-081-1/+1
|\ \ \ \ | |/ / /
| * | | Merge "Update EGL codegen to be in sync with frameworks/base"Narayan Kamath2014-02-211-1/+1
| |\ \ \
| | * | | Update EGL codegen to be in sync with frameworks/baseAshok Bhat2014-02-201-1/+1