Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/fr... | Steve Kondik | 2016-03-10 | 4 | -3/+38 |
|\ | |||||
| * | Revert "inputflinger: Initial support for rotary encoders." | Prashant Malani | 2016-01-13 | 1 | -9/+0 |
| * | Merge "inputflinger: Initial support for rotary encoders." into cw-e-dev | Prashant Malani | 2015-12-08 | 1 | -0/+9 |
| |\ | |||||
| | * | inputflinger: Initial support for rotary encoders. | Prashant Malani | 2015-09-14 | 1 | -0/+9 |
| * | | Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data" | Ben Fennema | 2015-12-02 | 2 | -2/+1 |
| * | | DO NOT MERGE ANYWHERE Add new interface for sensor physical data | Jani Suonpera | 2015-11-30 | 2 | -1/+2 |
| * | | Merge "OMX: clarify EOS signaling for tunneled decoders" into mnc-dev am: f1d... | Lajos Molnar | 2015-11-13 | 2 | -2/+13 |
| |\ \ | |||||
| | * \ | Merge "OMX: clarify EOS signaling for tunneled decoders" into mnc-dev | Lajos Molnar | 2015-11-13 | 2 | -2/+13 |
| | |\ \ | |||||
| | | * \ | Merge "OMX: clarify EOS signaling for tunneled decoders" into mnc-dev | Lajos Molnar | 2015-11-13 | 2 | -2/+13 |
| | | |\ \ | |||||
| | | | * | | OMX: clarify EOS signaling for tunneled decoders | Lajos Molnar | 2015-08-07 | 2 | -2/+13 |
| * | | | | | Merge changes from topic \'parcel-v2\' into mnc-dr-dev | Adrian Roos | 2015-10-23 | 1 | -1/+3 |
| |\ \ \ \ \ | | |/ / / / | |||||
| * | | | | | resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65 am: ... | Nick Kralevich | 2015-10-23 | 1 | -0/+1 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Revert "Track ashmem memory usage in Parcel" | Ian Pedowitz | 2015-10-22 | 1 | -4/+2 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Track ashmem memory usage in Parcel | Adrian Roos | 2015-10-22 | 1 | -2/+4 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | am 16b0ae10: Merge "add number constraint for samples per MotionEvent" into m... | Adam Lesinski | 2015-10-12 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | am 2f3c3eb4: Merge "Allow defining replacement key events in keymap" into mnc... | Puneet Kumar | 2015-10-08 | 2 | -0/+15 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge "Add KEYCODE_SOFT_SLEEP for Ungaze." into cw-e-dev | Nick Armstrong-Crews | 2015-09-04 | 2 | -1/+4 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Add KEYCODE_SOFT_SLEEP for Ungaze. | Nick Armstrong-Crews | 2015-09-02 | 2 | -1/+4 |
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |||||
* | | | | | | | | | | | Revert "Revert "gui: only support tertiary display if QTI_BSP is defined"" | Abhisek Devkota | 2016-01-09 | 1 | -2/+4 |
* | | | | | | | | | | | Revert "gui: only support tertiary display if QTI_BSP is defined" | Abhisek Devkota | 2016-01-07 | 1 | -4/+2 |
* | | | | | | | | | | | gui: only support tertiary display if QTI_BSP is defined | Abhisek Devkota | 2015-12-20 | 1 | -2/+4 |
* | | | | | | | | | | | libbinder: allow devices to disable ashmem size tracking | forkbomb | 2015-12-10 | 1 | -0/+2 |
* | | | | | | | | | | | Merge tag 'android-6.0.1_r3' of https://android.googlesource.com/platform/fra... | Steve Kondik | 2015-12-07 | 4 | -3/+24 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Merge changes from topic 'parcel-v2' into mnc-dr-dev | Adrian Roos | 2015-10-23 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |||||
| | * | | | | | | | | | Maintain Parcel ABI | Adrian Roos | 2015-10-22 | 1 | -3/+3 |
| | * | | | | | | | | | Revert "Revert "Track ashmem memory usage in Parcel"" | Adrian Roos | 2015-10-22 | 1 | -2/+4 |
| | | |_|_|_|_|/ / / | | |/| | | | | | | | |||||
| * | | | | | | | | | resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65 am: ... | Nick Kralevich | 2015-10-23 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | / / | | | |_|_|_|_|/ / | | |/| | | | | | | |||||
| | * | | | | | | | resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65 am: ... | Nick Kralevich | 2015-10-23 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65 am: ... | Nick Kralevich | 2015-10-23 | 1 | -0/+1 |
| | | |\ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ | resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65 | Nick Kralevich | 2015-10-23 | 1 | -0/+1 |
| | | | |\ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ | resolve merge conflicts of 834ac204ce to klp-modular-dev. | Nick Kralevich | 2015-10-23 | 1 | -0/+1 |
| | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | * \ \ \ \ \ \ | resolve merge conflicts of 834ac204ce to klp-modular-dev. | Nick Kralevich | 2015-10-22 | 1 | -0/+1 |
| | | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | | * | | | | | | | DO NOT MERGE: fix build breakage | Nick Kralevich | 2015-10-22 | 1 | -0/+1 |
| | * | | | | | | | | | | | | add number constraint for samples per MotionEvent am: 5d17838ade am: 72c8ca4a... | Flanker | 2015-10-22 | 1 | -0/+5 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | | | | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |||||
| | | * | | | | | | | | | | add number constraint for samples per MotionEvent am: 5d17838ade am: 72c8ca4a... | Flanker | 2015-10-22 | 1 | -0/+5 |
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | |||||
| | | | * | | | | | | | | | add number constraint for samples per MotionEvent am: 5d17838ade am: 72c8ca4a01 | Flanker | 2015-10-22 | 1 | -0/+5 |
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | |||||
| | | | | * | | | | | | | | add number constraint for samples per MotionEvent am: 5d17838ade | Flanker | 2015-10-22 | 1 | -0/+5 |
| | | | | |\ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / | |||||
| | | | | | * | | | | | | | add number constraint for samples per MotionEvent | Flanker | 2015-10-22 | 1 | -0/+5 |
| | | | | | |\ \ \ \ \ \ \ | | | | | | | |/ / / / / / | |||||
| | | | | | | * | | | | | | add number constraint for samples per MotionEvent | Flanker | 2015-10-20 | 1 | -0/+5 |
| | | * | | | | | | | | | | am 9e415d71: DO NOT MERGE: Introduce stem keycodes for Wear | Anthony Hugh | 2015-06-25 | 2 | -1/+14 |
| | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | DO NOT MERGE: Introduce stem keycodes for Wear | Anthony Hugh | 2015-06-24 | 2 | -1/+14 |
| * | | | | | | | | | | | | | Revert "Track ashmem memory usage in Parcel" | Ian Pedowitz | 2015-10-22 | 1 | -4/+2 |
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Track ashmem memory usage in Parcel | Adrian Roos | 2015-10-21 | 1 | -2/+4 |
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge "add number constraint for samples per MotionEvent" into mnc-dr-dev | Adam Lesinski | 2015-10-12 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | add number constraint for samples per MotionEvent | Flanker | 2015-10-12 | 1 | -0/+5 |
| * | | | | | | | | | | | Allow defining replacement key events in keymap | Dmitry Torokhov | 2015-09-29 | 2 | -0/+15 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | libbinder: allow devices to disable ashmem size tracking | forkbomb | 2015-12-04 | 1 | -0/+2 |
* | | | | | | | | | | | SurfaceFlinger: Native changes to add blur effect | Byunghun Jeon | 2015-11-08 | 4 | -2/+21 |
* | | | | | | | | | | | Merge tag 'android-6.0.0_r26' into HEAD | Ricardo Cerqueira | 2015-11-05 | 19 | -338/+1973 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | DO NOT MERGE Revert "am f37143d8: Merge "Cancel touches as well as pointer ge... | Michael Wright | 2015-09-22 | 2 | -22/+1 |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | |