summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/fra...mr1.1-stagingSteve Kondik2013-02-1315-55/+217
|\
| * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-12-100-0/+0
| |\
| | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-12-070-0/+0
| | |\
| | | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-12-060-0/+0
| | | |\
| | | | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-11-290-0/+0
| | | | |\
| | | | | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-11-270-0/+0
| | | | | |\
| | | | | | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-11-260-0/+0
| | | | | | |\
| | | | | | | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-11-190-0/+0
| | | | | | | |\
| | | | | | | | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-11-190-0/+0
| | | | | | | | |\
| | | | | | | | | * workaround: don't reset compositionType to HWC_FRAMEBUFFER [DO NOT MERGE]Mathias Agopian2012-11-191-1/+1
| | | | | | | | | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-11-160-0/+0
| | | | | | | | |/| | | | | | | | |/| |
| | | | | | | | | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-11-140-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-11-060-0/+0
| | | | | | | | | | |\
| * | | | | | | | | | | [DO NOT MERGE] GraphicBufferAllocator: stall alloc for async freesJamie Gennis2012-12-101-52/+108
| |/ / / / / / / / / /
| * | | | | | | | | | Revert "ConsumerBase: free buffers outside the lock"Jamie Gennis2012-12-071-24/+10
| * | | | | | | | | | DO NOT MERGE GraphicBufferAllocator: make frees asyncJamie Gennis2012-12-072-11/+56
| |/ / / / / / / / /
| * / / / / / / / / ConsumerBase: free buffers outside the lockJamie Gennis2012-12-061-10/+24
| |/ / / / / / / /
| * | | | | | | | Merge "make transform hint multi-display aware" into jb-mr1.1-devMathias Agopian2012-11-274-23/+64
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | make transform hint multi-display awareMathias Agopian2012-11-214-23/+64
| * | | | | | | | Merge "DO NOT MERGE - native_fence_sync: fix an enum name" into jb-mr1.1-devAndy McFadden2012-11-271-10/+11
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | DO NOT MERGE - native_fence_sync: fix an enum nameJamie Gennis2012-11-261-10/+11
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | gltrace: Make sure device is debuggable.Siva Velusamy2012-11-201-0/+6
| | |/ / / / / | |/| | | | |
| * | | | | | fix typo that broke all the buildsMathias Agopian2012-11-191-6/+3
| * | | | | | workaround: don't reset compositionType to HWC_FRAMEBUFFER [DO NOT MERGE]Mathias Agopian2012-11-191-1/+1
| | |_|/ / / | |/| | | |
| * | | | | fix an out-of-bounds memory accessMathias Agopian2012-11-151-4/+6
| | |/ / / | |/| | |
| * | | | Reset compositionType to HWC_FRAMEBUFFER before calling prepare()Mathias Agopian2012-11-143-1/+5
| |/ / /
| * | | Reduce emulator logspamAndy McFadden2012-11-082-2/+4
| * | | bugreport: Add /proc/interrupts dumpDmitry Shmidt2012-11-071-0/+3
| * | | bugreport: Add wlan FW counters dump for bcmdhdDmitry Shmidt2012-11-071-1/+5
| | | |
| | \ \
| *-. \ \ Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project2012-11-060-0/+0
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Always set vertex alpha when drawing screenshot layersJesse Hall2012-10-221-1/+2
| | * | | SurfaceFlinger: add animation transactionsJamie Gennis2012-10-165-9/+55
| | * | | merge in jb-mr1-factory-release history after reset to jb-mr1-devThe Android Automerger2012-10-150-0/+0
| | |\ \ \
| | | * \ \ merge in jb-mr1-factory-release history after reset to jb-mr1-devThe Android Automerger2012-10-120-0/+0
| | | |\ \ \
| | | | * \ \ merge in jb-mr1-factory-release history after reset to jb-mr1-devThe Android Automerger2012-10-120-0/+0
| | | | |\ \ \
| | | | | * \ \ merge in jb-mr1-factory-release history after reset to jb-mr1-devThe Android Automerger2012-10-110-0/+0
| | | | | |\ \ \
| | | | | | * \ \ merge in jb-mr1-factory-release history after reset to jb-mr1-devThe Android Automerger2012-10-100-0/+0
| | | | | | |\ \ \
* | | | | | | | | | libgui: Use fences for all QCOM targetsSteve Kondik2013-02-011-1/+1
* | | | | | | | | | Merge "FM Radio: Add support for FM Radio in Android" into cm-10.1Jef Oliver2013-01-302-0/+40
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | FM Radio: Add support for FM Radio in AndroidAlin Jerpelea2013-01-212-0/+40
* | | | | | | | | | | SurfaceComposerClient: bring back getDisplayWidth, Height & OrientationChirayu Desai2013-01-262-0/+26
* | | | | | | | | | | SurfaceFlinger: Change to support framebuffer flip for 2D blittersArun Kumar K.R2013-01-232-0/+9
|/ / / / / / / / / /
* | | | | | | | | | JB_MR1: native/libs/ui: Adding fix for conf 2.0 seg faultsVishrut Shah2013-01-201-0/+1
* | | | | | | | | | sensordevice: Dummy ALS: Solve fortified libc warningcm-10.1-M1Ricardo Cerqueira2013-01-021-1/+1
* | | | | | | | | | sensors: Add dummy light sensorRicardo Cerqueira2013-01-022-1/+52
* | | | | | | | | | ui/sf: Add support for exynos HDMIRicardo Cerqueira2012-12-306-1/+81
* | | | | | | | | | Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/fr...Steve Kondik2012-12-270-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-11-050-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | / | | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-300-0/+0
| | |\ \ \ \ \ \ \
| | | * | | | | | | partially implement external display clippingMathias Agopian2012-10-251-0/+25