summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* merge in jb-mr1.1-release history after reset to jb-mr1.1-devandroid-4.2.2_r1.2android-4.2.2_r1.1android-4.2.2_r1The 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 freesandroid-cts-4.2_r2Jamie 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
|\ \ \ \ | |_|/ / |/| | |
| | * | merge in jb-mr1-release history after reset to jb-mr1-devandroid-cts-4.2_r1android-4.2_r1android-4.2.1_r1.2android-4.2.1_r1.1android-4.2.1_r1The 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
| | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-250-0/+0
| | | |\
| | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-220-0/+0
| | | | |\
| | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-200-0/+0
| | | | | |\
| | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-190-0/+0
| | | | | | |\
| | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-180-0/+0
| | | | | | | |\
| | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-170-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-160-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-160-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-130-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-120-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-110-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-110-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-100-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-100-0/+0
| | | | | | | | | | | | | | | | |\
* | | | | | | | | | | | | | | | | | fix transitions from hwc to GLES compositionandroid-sdk-support_r11Mathias Agopian2012-11-051-4/+4
| |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | dumpstate: add kernel memory fragmentation unusable indexColin Cross2012-10-281-0/+1
* | | | | | | | | | | | | | | | | partially implement external display clippingMathias Agopian2012-10-251-0/+25
| |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Revert "Revert "put back the unused virtuals in Vector<>""Dave Burke2012-10-252-0/+39
| |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |