summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Create builtin display tokens on demand"Jesse Hall2012-11-272-25/+29
|\
| * Create builtin display tokens on demandJesse Hall2012-11-272-25/+29
|/
* am 434e21bf: am 3fdeb48e: Reduce emulator logspamAndy McFadden2012-11-092-2/+4
|\
| * am 3fdeb48e: Reduce emulator logspamAndy McFadden2012-11-092-2/+4
| |\
| | * Reduce emulator logspamAndy McFadden2012-11-082-2/+4
* | | am 4bacaec4: am 0b2c9268: bugreport: Add /proc/interrupts dumpDmitry Shmidt2012-11-081-0/+3
|\ \ \ | |/ /
| * | am 0b2c9268: bugreport: Add /proc/interrupts dumpDmitry Shmidt2012-11-071-0/+3
| |\ \ | | |/
| | * bugreport: Add /proc/interrupts dumpDmitry Shmidt2012-11-071-0/+3
* | | am 61db92e7: am c11f56e5: bugreport: Add wlan FW counters dump for bcmdhdDmitry Shmidt2012-11-081-1/+5
|\ \ \ | |/ /
| * | am c11f56e5: bugreport: Add wlan FW counters dump for bcmdhdDmitry Shmidt2012-11-071-1/+5
| |\ \ | | |/
| | * bugreport: Add wlan FW counters dump for bcmdhdDmitry Shmidt2012-11-071-1/+5
* | | am 5e530e02: am a151a19d: Merge "Fix return type of glGetAttribLocation and g...Andrew Hsieh2012-11-069-21/+21
|\ \ \
| * \ \ am a151a19d: Merge "Fix return type of glGetAttribLocation and glGetUniformLo...Andrew Hsieh2012-11-069-21/+21
| |\ \ \
| | * \ \ Merge "Fix return type of glGetAttribLocation and glGetUniformLocation"Andrew Hsieh2012-11-069-21/+21
| | |\ \ \
| | | * | | Fix return type of glGetAttribLocation and glGetUniformLocationAndrew Hsieh2012-11-069-21/+21
| | |/ / /
* | | | | Reconcile with jb-mr1.1-release - do not mergeThe Android Open Source Project2012-11-060-0/+0
|\ \ \ \ \
| * \ \ \ \ merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-11-060-0/+0
| |\ \ \ \ \
* | \ \ \ \ \ am 20152ac7: am d8e8e662: Reconcile with jb-mr1-factory-release jb-mr1-releas...The Android Open Source Project2012-11-060-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | am d8e8e662: Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project2012-11-060-0/+0
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | | | | | |
| | | \ \ \ \
| | *-. \ \ \ \ 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-devThe Android Automerger2012-11-050-0/+0
| | | | |\ \ \ \ | | | |/ / / / / | | |/| | / / / | | | | |/ / /
* | | | | | | am e70fbe8b: am 02b95105: fix transitions from hwc to GLES compositionMathias Agopian2012-11-051-4/+4
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | / / | |_|_|_|/ / |/| | | | |
| * | | | | am 02b95105: fix transitions from hwc to GLES compositionMathias Agopian2012-11-051-4/+4
| |\ \ \ \ \ | | |/ / / /
| | * | | | fix transitions from hwc to GLES compositionMathias Agopian2012-11-051-4/+4
| | | | | |
| \ \ \ \ \
*-. \ \ \ \ \ Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project2012-10-310-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
| | | | | | | | | | |\ \ \
| * | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ am 742801c6: am 2281af96: dumpstate: add kernel memory fragmentation unusable...Colin Cross2012-10-291-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | am 2281af96: dumpstate: add kernel memory fragmentation unusable indexColin Cross2012-10-291-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | dumpstate: add kernel memory fragmentation unusable indexColin Cross2012-10-281-0/+1
* | | | | | | | | | | | | | | am 78b4977e: Merge "Ensure that Vector::erase() returns a valid iterator" int...Jason Simmons2012-10-251-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge "Ensure that Vector::erase() returns a valid iterator" into jb-mr1-aah-devJason Simmons2012-10-251-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Ensure that Vector::erase() returns a valid iteratorJason Simmons2012-10-251-1/+2
| | | |_|_|/ / / / / / / / / | | |/| | | | | | | | | | |
* | | | | | | | | | | | | | am f45c5100: partially implement external display clippingMathias Agopian2012-10-251-0/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | partially implement external display clippingMathias Agopian2012-10-251-0/+25
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | am 04075569: Revert "Revert "put back the unused virtuals in Vector<>""Dave Burke2012-10-252-0/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Revert "Revert "put back the unused virtuals in Vector<>""Dave Burke2012-10-252-0/+39
| |/ / / / / / / / / / /
* | | | | | | | | | | | am d17e3b5f: prevent a client from crashing surfaceflingerMathias Agopian2012-10-221-2/+17
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | prevent a client from crashing surfaceflingerMathias Agopian2012-10-221-2/+17