summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/fr...Steve Kondik2016-03-109-27/+66
|\
| * IGraphicBufferProducer: fix QUEUE_BUFFER info leak am: d06421fd37 am: 4133183...Robert Shih2016-01-151-0/+1
| |\
| | * IGraphicBufferProducer: fix QUEUE_BUFFER info leak am: d06421fd37 am: 4133183...Robert Shih2016-01-151-0/+1
| | |\
| | | * IGraphicBufferProducer: fix QUEUE_BUFFER info leak am: d06421fd37 am: 4133183...Robert Shih2016-01-151-0/+1
| | | |\
| | | | * IGraphicBufferProducer: fix QUEUE_BUFFER info leak am: d06421fd37 am: 4133183...Robert Shih2016-01-151-0/+1
| | | | |\
| | | | | * IGraphicBufferProducer: fix QUEUE_BUFFER info leak am: d06421fd37 am: 4133183...Robert Shih2016-01-151-0/+1
| | | | | |\
| | | | | | * IGraphicBufferProducer: fix QUEUE_BUFFER info leak am: d06421fd37 am: 413318311cRobert Shih2016-01-151-0/+1
| | | | | | |\
| | | | | | | * IGraphicBufferProducer: fix QUEUE_BUFFER info leak am: d06421fd37Robert Shih2016-01-151-0/+1
| | | | | | | |\
| | | | | | | | * IGraphicBufferProducer: fix QUEUE_BUFFER info leakRobert Shih2016-01-151-0/+1
| | | | | | | | |\
| | | | | | | | | * IGraphicBufferProducer: fix QUEUE_BUFFER info leakRobert Shih2016-01-111-0/+1
| * | | | | | | | | IGraphicBufferConsumer: fix ATTACH_BUFFER info leak am: dded8fdbb7 am: 7ee203...Robert Shih2016-01-151-1/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | IGraphicBufferConsumer: fix ATTACH_BUFFER info leak am: dded8fdbb7 am: 7ee203...Robert Shih2016-01-151-1/+1
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | IGraphicBufferConsumer: fix ATTACH_BUFFER info leak am: dded8fdbb7 am: 7ee203...Robert Shih2016-01-151-1/+1
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / /
| | | | * | | | | | IGraphicBufferConsumer: fix ATTACH_BUFFER info leak am: dded8fdbb7 am: 7ee203...Robert Shih2016-01-151-1/+1
| | | | |\ \ \ \ \ \ | | | | | |/ / / / /
| | | | | * | | | | IGraphicBufferConsumer: fix ATTACH_BUFFER info leak am: dded8fdbb7Robert Shih2016-01-151-1/+1
| | | | | |\ \ \ \ \ | | | | | | |/ / / /
| | | | | | * | | | IGraphicBufferConsumer: fix ATTACH_BUFFER info leakRobert Shih2016-01-151-1/+1
| | | | | | |\ \ \ \ | | | | | | | |/ / /
| | | | | | | * | | IGraphicBufferConsumer: fix ATTACH_BUFFER info leakRobert Shih2016-01-111-1/+1
| * | | | | | | | | Revert "inputflinger: Initial support for rotary encoders."Prashant Malani2016-01-135-132/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Revert "inputflinger: Initial support for rotary encoders."Prashant Malani2016-01-135-132/+0
| * | | | | | | | | Revert "inputflinger: Add support for scaling and true value reporting"Prashant Malani2016-01-132-14/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Revert "inputflinger: Add support for scaling and true value reporting"Prashant Malani2016-01-132-14/+2
| * | | | | | | | | inputflinger: Add support for scaling and true value reportingPrashant Malani2016-01-132-2/+14
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | inputflinger: Add support for scaling and true value reportingPrashant Malani2016-01-112-2/+14
| * | | | | | | | | dumpstate: increase logcat timeout to 40 seconds (DO NOT MERGE)Mark Salyzyn2015-12-181-6/+8
| * | | | | | | | | Merge "inputflinger: Initial support for rotary encoders." into cw-e-devPrashant Malani2015-12-085-0/+132
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge "inputflinger: Initial support for rotary encoders." into cw-e-devPrashant Malani2015-12-085-0/+132
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | inputflinger: Initial support for rotary encoders.Prashant Malani2015-09-145-0/+132
| * | | | | | | | | | Merge "DO NOT MERGE: add support for new sched tracepoint" into mnc-dr1.5-devMartijn Coenen2015-12-041-0/+1
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | DO NOT MERGE: add support for new sched tracepointTim Murray2015-11-301-0/+1
| * | | | | | | | | | | Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"Ben Fennema2015-12-020-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"Ben Fennema2015-12-028-64/+2
| * | | | | | | | | | | DO NOT MERGE ANYWHERE Add new interface for sensor physical dataJani Suonpera2015-12-020-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | DO NOT MERGE ANYWHERE Add new interface for sensor physical dataJani Suonpera2015-11-308-2/+64
| * | | | | | | | | | | Increase raft timeout to 10min so we get complete logs from older devices.Sharvil Nanavati2015-11-301-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | / / / / / / / / / | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Increase raft timeout to 10min so we get complete logs from older devices.Sharvil Nanavati2015-11-271-1/+1
| * | | | | | | | | | Set cpuset from surfaceflinger.Tim Murray2015-11-182-0/+11
| * | | | | | | | | | 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-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 "Avoiding flush on-change sensors at subscription" into mnc-dr-dev am: ...Peng Xu2015-10-291-4/+9
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Merge "Avoiding flush on-change sensors at subscription" into mnc-dr-devPeng Xu2015-10-271-4/+9
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| * | | | | | | | | | | DO NOT MERGE: fix build try #2 am: 778b6f4902 am: 034bc1799c -s ours am: dbc...Nick Kralevich2015-10-230-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | DO NOT MERGE: fix build try #2 am: 778b6f4902 am: 034bc1799c -s ours am: dbc...Nick Kralevich2015-10-230-0/+0
| | |\ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ Merge changes from topic \'parcel-v2\' into mnc-dr-dev am: cf33d50d25Adrian Roos2015-10-232-15/+51
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Merge changes from topic \'parcel-v2\' into mnc-dr-devAdrian Roos2015-10-232-15/+51
| | |\ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ 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
| | |\ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ add number constraint for samples per MotionEvent am: 5d17838ade am: 72c8ca4a...Flanker2015-10-230-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /