summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Don't pass in empty arg to dex2oat.Mathieu Chartier2014-03-051-1/+1
* 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
|/
* 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
* | Merge "hwc test: 64-bit compilation error"Mark Salyzyn2014-03-041-2/+2
|\ \
| * | hwc test: 64-bit compilation errorMark Salyzyn2014-03-041-2/+2
|/ /
* | Merge "Fix misuse of $(my-dir)."Ying Wang2014-03-011-2/+0
|\ \
| * | Fix misuse of $(my-dir).Ying Wang2014-02-281-2/+0
|/ /
* | 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
|/ /
* | 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
|/ /
* | Merge "Virtual Display async mode is overridden"Jesse Hall2014-02-251-10/+10
|\ \
| * | Virtual Display async mode is overriddenJohn Dong2014-02-211-10/+10
* | | 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
* | | | 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
| |/ / /
* | | | 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
|/ / /
* | | 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
* | | 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
* | | | Merge "Update GLES codegen to be in sync with frameworks/base"Narayan Kamath2014-02-211-1/+1
|\ \ \ \
| * | | | Update GLES codegen to be in sync with frameworks/baseAshok Bhat2014-02-201-1/+1
| |/ / /
* | | | Merge "surfaceflinger: add BoardConfig.mk variable to force 32-bit"Colin Cross2014-02-211-0/+4
|\ \ \ \ | |/ / / |/| | |
| * | | surfaceflinger: add BoardConfig.mk variable to force 32-bitColin Cross2014-02-201-0/+4
|/ / /
* | | Merge "libagl: support multilib build"Colin Cross2014-02-181-11/+7
|\ \ \
| * | | libagl: support multilib buildColin Cross2014-02-141-11/+7
| |/ /
* | | Merge "Use /(vendor|system)/lib64/egl for 64-bit EGL libraries"Colin Cross2014-02-181-0/+14
|\ \ \ | |/ / |/| |
| * | Use /(vendor|system)/lib64/egl for 64-bit EGL librariesDan Willemsen2014-02-161-0/+14
|/ /
* | Merge "frameworks/native: move idmap to frameworks/base"Dianne Hackborn2014-02-146-1056/+0
|\ \
| * | frameworks/native: move idmap to frameworks/baseColin Cross2014-02-116-1056/+0
* | | Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."Nick Kralevich2014-02-123-4/+4
|\ \ \ | |/ / |/| |
| * | Convert all selinux_android_restorecon and _setfilecon calls to new API.Stephen Smalley2014-02-073-4/+4
* | | Merge "Runtime resource overlay, iteration 2"Dianne Hackborn2014-02-113-10/+129
|\ \ \
| * | | Runtime resource overlay, iteration 2Mårten Kongstad2014-02-033-10/+129
* | | | Merge "New command line tool 'idmap'"Dianne Hackborn2014-02-116-0/+1056
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | New command line tool 'idmap'Mårten Kongstad2014-02-036-0/+1056
* | | Merge "binder: fix all warnings"Colin Cross2014-02-068-36/+39
|\ \ \
| * | | binder: fix all warningsColin Cross2014-02-058-36/+39
|/ / /
* | | Merge "Fixed apparent copy/paste mistake Bug: 11634373"Andrew Hsieh2014-02-051-1/+1
|\ \ \
| * | | Fixed apparent copy/paste mistakeDavid Friedman2014-02-051-1/+1
* | | | Merge "GLES_trace: fix compile errors on 64 bit architectures"Siva Velusamy2014-02-042-638/+640
|\ \ \ \ | |/ / / |/| | |
| * | | GLES_trace: fix compile errors on 64 bit architecturesSiva Velusamy2014-01-282-638/+640
* | | | Merge "Use 64 bit binder interface if TARGET_USES_64_BIT_BINDER _or_ TARGET_I...Arve Hjønnevåg2014-02-042-0/+6
|\ \ \ \