summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Revert "Revert "gui: only support tertiary display if QTI_BSP is defined""Abhisek Devkota2016-01-091-2/+4
* Revert "gui: only support tertiary display if QTI_BSP is defined"Abhisek Devkota2016-01-071-4/+2
* gui: only support tertiary display if QTI_BSP is definedAbhisek Devkota2015-12-201-2/+4
* libbinder: allow devices to disable ashmem size trackingforkbomb2015-12-101-0/+2
* Merge tag 'android-6.0.1_r3' of https://android.googlesource.com/platform/fra...Steve Kondik2015-12-074-3/+24
|\
| * Merge changes from topic 'parcel-v2' into mnc-dr-devAdrian Roos2015-10-231-1/+3
| |\
| | * Maintain Parcel ABIAdrian Roos2015-10-221-3/+3
| | * Revert "Revert "Track ashmem memory usage in Parcel""Adrian Roos2015-10-221-2/+4
| * | resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65 am: ...Nick Kralevich2015-10-231-0/+1
| |\ \ | | |/ | |/|
| | * resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65 am: ...Nick Kralevich2015-10-231-0/+1
| | |\
| | | * resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65 am: ...Nick Kralevich2015-10-231-0/+1
| | | |\
| | | | * resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65Nick Kralevich2015-10-231-0/+1
| | | | |\
| | | | | * resolve merge conflicts of 834ac204ce to klp-modular-dev.Nick Kralevich2015-10-231-0/+1
| | | | | |\
| | | | | | * resolve merge conflicts of 834ac204ce to klp-modular-dev.Nick Kralevich2015-10-221-0/+1
| | | | | | |\
| | | | | | | * DO NOT MERGE: fix build breakageNick Kralevich2015-10-221-0/+1
| | * | | | | | add number constraint for samples per MotionEvent am: 5d17838ade am: 72c8ca4a...Flanker2015-10-221-0/+5
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | add number constraint for samples per MotionEvent am: 5d17838ade am: 72c8ca4a...Flanker2015-10-221-0/+5
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | add number constraint for samples per MotionEvent am: 5d17838ade am: 72c8ca4a01Flanker2015-10-221-0/+5
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | add number constraint for samples per MotionEvent am: 5d17838adeFlanker2015-10-221-0/+5
| | | | | |\ \ \ | | | | | | |/ /
| | | | | | * | add number constraint for samples per MotionEventFlanker2015-10-221-0/+5
| | | | | | |\ \ | | | | | | | |/
| | | | | | | * add number constraint for samples per MotionEventFlanker2015-10-201-0/+5
| | | * | | | | am 9e415d71: DO NOT MERGE: Introduce stem keycodes for WearAnthony Hugh2015-06-252-1/+14
| | | |\ \ \ \ \
| | | | * | | | | DO NOT MERGE: Introduce stem keycodes for WearAnthony Hugh2015-06-242-1/+14
| * | | | | | | | Revert "Track ashmem memory usage in Parcel"Ian Pedowitz2015-10-221-4/+2
| * | | | | | | | Track ashmem memory usage in ParcelAdrian Roos2015-10-211-2/+4
| * | | | | | | | Merge "add number constraint for samples per MotionEvent" into mnc-dr-devAdam Lesinski2015-10-121-0/+5
| |\ \ \ \ \ \ \ \
| | * | | | | | | | add number constraint for samples per MotionEventFlanker2015-10-121-0/+5
| * | | | | | | | | Allow defining replacement key events in keymapDmitry Torokhov2015-09-292-0/+15
| |/ / / / / / / /
* | | | | | | | | libbinder: allow devices to disable ashmem size trackingforkbomb2015-12-041-0/+2
* | | | | | | | | SurfaceFlinger: Native changes to add blur effectByunghun Jeon2015-11-084-2/+21
* | | | | | | | | Merge tag 'android-6.0.0_r26' into HEADRicardo Cerqueira2015-11-0519-338/+1973
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | DO NOT MERGE Revert "am f37143d8: Merge "Cancel touches as well as pointer ge...Michael Wright2015-09-222-22/+1
| * | | | | | | | SF: Add colorTransform to DisplayInfoDan Stoza2015-08-311-0/+1
| * | | | | | | | Merge commit '62ec2dd5' into mmMichael Wright2015-08-072-1/+9
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| * | | | | | | | Bug fix in SensorManager.Aravind Akella2015-07-301-51/+2
| * | | | | | | | am a29db50c: Merge "Revert "Bug fix in SensorManager."" into mnc-devNarayan Kamath2015-07-291-3/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am 2376bd68: Merge "Bug fix in SensorManager." into mnc-devAravind Akella2015-07-291-1/+3
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ am f892f914: Merge "omx: fix structure sizes to be the same on 32 and 64-bit ...Lajos Molnar2015-07-211-10/+18
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Show charging speed on KeyguardAdrian Roos2015-07-101-0/+1
| * | | | | | | | | | | Merge "Cancel touches as well as pointer gestures." into mnc-devMichael Wright2015-07-0916-279/+1981
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ am 3875698f: am e74f1557: Merge "omx: add OMX_IndexParamConsumerUsageBits" in...Lajos Molnar2015-06-262-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ am e74f1557: Merge "omx: add OMX_IndexParamConsumerUsageBits" into mnc-devLajos Molnar2015-06-262-0/+2
| | | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Introduce stem keycodes for WearAnthony Hugh2015-06-242-1/+14
| | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | am 0638a4fa: Merge "libgui/SF: Propagate SECURE Layer flag changes" into mnc-devDan Stoza2015-06-231-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge commit '71997c1a' into manualmergeMichael Wright2015-06-231-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ am 18c77330: Merge "Add method to set action button on MotionEvent" into mnc-devMichael Wright2015-06-231-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 8a4222a6: Merge "Add tracing header" into mnc-devChris Craik2015-06-111-0/+55
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 037d4ca3: Merge "media: change parameters for OMX_EventOutputRendered" int...Lajos Molnar2015-06-092-2/+14
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c6f30bde: libgui/SurfaceFlinger: Add getConsumerNameDan Stoza2015-06-083-0/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 5b36ea44: Merge "Revert "libgui: Add getConsumerName"" into mnc-devDan Stoza2015-06-083-9/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \