summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/fr...Steve Kondik2016-03-104-3/+38
|\
| * Revert "inputflinger: Initial support for rotary encoders."Prashant Malani2016-01-131-9/+0
| * Merge "inputflinger: Initial support for rotary encoders." into cw-e-devPrashant Malani2015-12-081-0/+9
| |\
| | * inputflinger: Initial support for rotary encoders.Prashant Malani2015-09-141-0/+9
| * | Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"Ben Fennema2015-12-022-2/+1
| * | DO NOT MERGE ANYWHERE Add new interface for sensor physical dataJani Suonpera2015-11-302-1/+2
| * | Merge "OMX: clarify EOS signaling for tunneled decoders" into mnc-dev am: f1d...Lajos Molnar2015-11-132-2/+13
| |\ \
| | * \ Merge "OMX: clarify EOS signaling for tunneled decoders" into mnc-devLajos Molnar2015-11-132-2/+13
| | |\ \
| | | * \ Merge "OMX: clarify EOS signaling for tunneled decoders" into mnc-devLajos Molnar2015-11-132-2/+13
| | | |\ \
| | | | * | OMX: clarify EOS signaling for tunneled decodersLajos Molnar2015-08-072-2/+13
| * | | | | Merge changes from topic \'parcel-v2\' into mnc-dr-devAdrian Roos2015-10-231-1/+3
| |\ \ \ \ \ | | |/ / / /
| * | | | | resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65 am: ...Nick Kralevich2015-10-231-0/+1
| |\ \ \ \ \
| * \ \ \ \ \ Revert "Track ashmem memory usage in Parcel"Ian Pedowitz2015-10-221-4/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Track ashmem memory usage in ParcelAdrian Roos2015-10-221-2/+4
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ am 16b0ae10: Merge "add number constraint for samples per MotionEvent" into m...Adam Lesinski2015-10-121-0/+5
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am 2f3c3eb4: Merge "Allow defining replacement key events in keymap" into mnc...Puneet Kumar2015-10-082-0/+15
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge "Add KEYCODE_SOFT_SLEEP for Ungaze." into cw-e-devNick Armstrong-Crews2015-09-042-1/+4
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Add KEYCODE_SOFT_SLEEP for Ungaze.Nick Armstrong-Crews2015-09-022-1/+4
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
* | | | | | | | | | | 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
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |