Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| * | | | | | | | | SF: Add colorTransform to DisplayInfo | Dan Stoza | 2015-08-31 | 1 | -0/+1 |
| * | | | | | | | | Merge commit '62ec2dd5' into mm | Michael Wright | 2015-08-07 | 2 | -1/+9 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| * | | | | | | | | Bug fix in SensorManager. | Aravind Akella | 2015-07-30 | 1 | -51/+2 |
| * | | | | | | | | am a29db50c: Merge "Revert "Bug fix in SensorManager."" into mnc-dev | Narayan Kamath | 2015-07-29 | 1 | -3/+1 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | am 2376bd68: Merge "Bug fix in SensorManager." into mnc-dev | Aravind Akella | 2015-07-29 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | am f892f914: Merge "omx: fix structure sizes to be the same on 32 and 64-bit ... | Lajos Molnar | 2015-07-21 | 1 | -10/+18 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Show charging speed on Keyguard | Adrian Roos | 2015-07-10 | 1 | -0/+1 |
| * | | | | | | | | | | | Merge "Cancel touches as well as pointer gestures." into mnc-dev | Michael Wright | 2015-07-09 | 16 | -279/+1981 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | am 3875698f: am e74f1557: Merge "omx: add OMX_IndexParamConsumerUsageBits" in... | Lajos Molnar | 2015-06-26 | 2 | -0/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ | am e74f1557: Merge "omx: add OMX_IndexParamConsumerUsageBits" into mnc-dev | Lajos Molnar | 2015-06-26 | 2 | -0/+2 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | Introduce stem keycodes for Wear | Anthony Hugh | 2015-06-24 | 2 | -1/+14 |
| | |/ / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | am 0638a4fa: Merge "libgui/SF: Propagate SECURE Layer flag changes" into mnc-dev | Dan Stoza | 2015-06-23 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit '71997c1a' into manualmerge | Michael Wright | 2015-06-23 | 1 | -0/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | am 18c77330: Merge "Add method to set action button on MotionEvent" into mnc-dev | Michael Wright | 2015-06-23 | 1 | -0/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 8a4222a6: Merge "Add tracing header" into mnc-dev | Chris Craik | 2015-06-11 | 1 | -0/+55 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 037d4ca3: Merge "media: change parameters for OMX_EventOutputRendered" int... | Lajos Molnar | 2015-06-09 | 2 | -2/+14 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am c6f30bde: libgui/SurfaceFlinger: Add getConsumerName | Dan Stoza | 2015-06-08 | 3 | -0/+9 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 5b36ea44: Merge "Revert "libgui: Add getConsumerName"" into mnc-dev | Dan Stoza | 2015-06-08 | 3 | -9/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |