summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am a8c2454d: fix build: media: add back legacy name for VideoGrallocMetadataLajos Molnar2015-06-021-0/+6
|\
| * fix build: media: add back legacy name for VideoGrallocMetadataLajos Molnar2015-06-011-0/+6
* | am da7cbd8c: Merge "media: refine kMetadataBufferTypes" into mnc-devLajos Molnar2015-06-022-29/+64
|\ \ | |/
| * Merge "media: refine kMetadataBufferTypes" into mnc-devLajos Molnar2015-06-022-29/+64
| |\
| | * media: refine kMetadataBufferTypesLajos Molnar2015-05-292-29/+64
* | | am 7e5bb370: Merge "Track camera and flashlight usage in battery stats." into...Ruben Brunk2015-06-022-0/+93
|\ \ \ | |/ /
| * | Merge "Track camera and flashlight usage in battery stats." into mnc-devRuben Brunk2015-06-022-0/+93
| |\ \
| | * | Track camera and flashlight usage in battery stats.Ruben Brunk2015-06-012-0/+93
* | | | am 5a31f1ab: Merge "Disregard alleged binder entities beyond parcel bounds" i...Christopher Tate2015-06-021-1/+1
|\ \ \ \ | |/ / /
| * | | Merge "Disregard alleged binder entities beyond parcel bounds" into mnc-devChristopher Tate2015-06-021-1/+1
| |\ \ \
| | * | | Disregard alleged binder entities beyond parcel boundsChristopher Tate2015-05-271-1/+1
* | | | | am 6a04e5fc: libgui: Propagate error by clearing sp<GB>Dan Stoza2015-06-020-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | libgui: Propagate error by clearing sp<GB>Dan Stoza2015-06-011-0/+3
* | | | | am ae892959: am 8980e0cc: Merge "libgui: Propagate error by clearing sp<GB>"Dan Stoza2015-06-011-0/+3
|\ \ \ \ \
| * \ \ \ \ am 8980e0cc: Merge "libgui: Propagate error by clearing sp<GB>"Dan Stoza2015-06-011-0/+3
| |\ \ \ \ \
| | * \ \ \ \ Merge "libgui: Propagate error by clearing sp<GB>"Dan Stoza2015-06-011-0/+3
| | |\ \ \ \ \
| | | * | | | | libgui: Propagate error by clearing sp<GB>Dan Stoza2015-06-011-0/+3
| | |/ / / / /
* | | | | | | am f6f221aa: Merge "SF: Reduce resync samples without present" into mnc-devDan Stoza2015-06-010-0/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge "SF: Reduce resync samples without present" into mnc-devDan Stoza2015-06-011-1/+1
| |\ \ \ \ \ \
| | * | | | | | SF: Reduce resync samples without presentDan Stoza2015-05-291-1/+1
* | | | | | | | am da5a3f40: Merge "libui: Apply GRALLOC_USAGE_ALLOC_MASK during alloc" into ...Dan Stoza2015-06-010-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "libui: Apply GRALLOC_USAGE_ALLOC_MASK during alloc" into mnc-devDan Stoza2015-06-011-0/+3
| |\ \ \ \ \ \ \
| | * | | | | | | libui: Apply GRALLOC_USAGE_ALLOC_MASK during allocDan Stoza2015-05-291-0/+3
| | | |_|_|_|_|/ | | |/| | | | |
* | | | | | | | Merge branch 'mnc-dev-plus-aosp' of https://googleplex-android.googlesource.c...Joe Fernandez2015-06-010-0/+0
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ am 67ff12d9: am cf1edb3f: Merge "Fix libgui crop matrix test."Dan Stoza2015-06-011-6/+23
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | am cf1edb3f: Merge "Fix libgui crop matrix test."Dan Stoza2015-06-011-6/+23
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | |
| | | * | | | | | Merge "Fix libgui crop matrix test."Dan Stoza2015-06-011-6/+23
| | | |\ \ \ \ \ \
| | | | * | | | | | Fix libgui crop matrix test.Michael Lentine2015-06-011-6/+23
| | | |/ / / / / /
* | | | | | | | | am 04b00cea: Fix libgui crop matrix test.Michael Lentine2015-06-011-6/+23
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | / / / / / | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Fix libgui crop matrix test.Michael Lentine2015-05-291-6/+23
| | |_|/ / / / | |/| | | | |
* | | | | | | am 958e9bbd: am 75145aa2: Merge "SF: Reduce resync samples without present"Dan Stoza2015-06-011-1/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | am 75145aa2: Merge "SF: Reduce resync samples without present"Dan Stoza2015-06-011-1/+1
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge "SF: Reduce resync samples without present"Dan Stoza2015-06-011-1/+1
| | |\ \ \ \ \
| | | * | | | | SF: Reduce resync samples without presentDan Stoza2015-06-011-1/+1
| | |/ / / / /
* | | | | | | am 2daeb124: am edcfe7c5: Merge "libui: Apply GRALLOC_USAGE_ALLOC_MASK during...Dan Stoza2015-06-011-0/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am edcfe7c5: Merge "libui: Apply GRALLOC_USAGE_ALLOC_MASK during alloc"Dan Stoza2015-06-011-0/+3
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "libui: Apply GRALLOC_USAGE_ALLOC_MASK during alloc"Dan Stoza2015-06-011-0/+3
| | |\ \ \ \ \
| | | * | | | | libui: Apply GRALLOC_USAGE_ALLOC_MASK during allocDan Stoza2015-06-011-0/+3
| | |/ / / / /
* | | | | | | am 04bb7a9a: am c76683f5: Merge "Check that width and height parameters are s...Dan Stoza2015-06-010-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am c76683f5: Merge "Check that width and height parameters are small."Dan Stoza2015-06-011-4/+31
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Check that width and height parameters are small."Dan Stoza2015-06-011-4/+31
| | |\ \ \ \ \
| | | * | | | | Check that width and height parameters are small.Michael Lentine2015-06-011-4/+31
| | |/ / / / /
* | | | | | | am 1c4537e2: Check that width and height parameters are small.Michael Lentine2015-05-291-4/+31
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Check that width and height parameters are small.Michael Lentine2015-05-291-4/+31
| | |_|/ / / | |/| | | |
* | | | | | am 6e1a2fea: Revert "Modify EGL to disconnect the window when the surface get...Michael Lentine2015-05-292-11/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Revert "Modify EGL to disconnect the window when the surface gets destroyed."Michael Lentine2015-05-282-11/+2
* | | | | | am 89301eaf: Fix EGL shim extension injection for GL ES 3 drivers.Alistair Strachan2015-05-280-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fix EGL shim extension injection for GL ES 3 drivers.Alistair Strachan2015-05-287-16/+155
* | | | | | am 2a185c24: am a8702c47: Merge "SurfaceFlinger: Tweak whitespace in DdmConne...Dan Stoza2015-05-280-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am a8702c47: Merge "SurfaceFlinger: Tweak whitespace in DdmConnection"Dan Stoza2015-05-281-1/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | |