Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
* | Merge "Create builtin display tokens on demand" | Jesse Hall | 2012-11-27 | 2 | -25/+29 | |
|\ | ||||||
| * | Create builtin display tokens on demand | Jesse Hall | 2012-11-27 | 2 | -25/+29 | |
|/ | ||||||
* | am 434e21bf: am 3fdeb48e: Reduce emulator logspam | Andy McFadden | 2012-11-09 | 2 | -2/+4 | |
|\ | ||||||
| * | am 3fdeb48e: Reduce emulator logspam | Andy McFadden | 2012-11-09 | 2 | -2/+4 | |
| |\ | ||||||
| | * | Reduce emulator logspam | Andy McFadden | 2012-11-08 | 2 | -2/+4 | |
* | | | am 4bacaec4: am 0b2c9268: bugreport: Add /proc/interrupts dump | Dmitry Shmidt | 2012-11-08 | 1 | -0/+3 | |
|\ \ \ | |/ / | ||||||
| * | | am 0b2c9268: bugreport: Add /proc/interrupts dump | Dmitry Shmidt | 2012-11-07 | 1 | -0/+3 | |
| |\ \ | | |/ | ||||||
| | * | bugreport: Add /proc/interrupts dump | Dmitry Shmidt | 2012-11-07 | 1 | -0/+3 | |
* | | | am 61db92e7: am c11f56e5: bugreport: Add wlan FW counters dump for bcmdhd | Dmitry Shmidt | 2012-11-08 | 1 | -1/+5 | |
|\ \ \ | |/ / | ||||||
| * | | am c11f56e5: bugreport: Add wlan FW counters dump for bcmdhd | Dmitry Shmidt | 2012-11-07 | 1 | -1/+5 | |
| |\ \ | | |/ | ||||||
| | * | bugreport: Add wlan FW counters dump for bcmdhd | Dmitry Shmidt | 2012-11-07 | 1 | -1/+5 | |
* | | | am 5e530e02: am a151a19d: Merge "Fix return type of glGetAttribLocation and g... | Andrew Hsieh | 2012-11-06 | 9 | -21/+21 | |
|\ \ \ | ||||||
| * \ \ | am a151a19d: Merge "Fix return type of glGetAttribLocation and glGetUniformLo... | Andrew Hsieh | 2012-11-06 | 9 | -21/+21 | |
| |\ \ \ | ||||||
| | * \ \ | Merge "Fix return type of glGetAttribLocation and glGetUniformLocation" | Andrew Hsieh | 2012-11-06 | 9 | -21/+21 | |
| | |\ \ \ | ||||||
| | | * | | | Fix return type of glGetAttribLocation and glGetUniformLocation | Andrew Hsieh | 2012-11-06 | 9 | -21/+21 | |
| | |/ / / | ||||||
* | | | | | Reconcile with jb-mr1.1-release - do not merge | The Android Open Source Project | 2012-11-06 | 0 | -0/+0 | |
|\ \ \ \ \ | ||||||
| * \ \ \ \ | merge in jb-mr1.1-release history after reset to jb-mr1.1-dev | The Android Automerger | 2012-11-06 | 0 | -0/+0 | |
| |\ \ \ \ \ | ||||||
* | \ \ \ \ \ | am 20152ac7: am d8e8e662: Reconcile with jb-mr1-factory-release jb-mr1-releas... | The Android Open Source Project | 2012-11-06 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | ||||||
| * | | | | | | am d8e8e662: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge | The Android Open Source Project | 2012-11-06 | 0 | -0/+0 | |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | ||||||
| | | | | | | | ||||||
| | | \ \ \ \ | ||||||
| | *-. \ \ \ \ | Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge | The Android Open Source Project | 2012-11-06 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | ||||||
| | | | * | | | | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-11-05 | 0 | -0/+0 | |
| | | | |\ \ \ \ | | | |/ / / / / | | |/| | / / / | | | | |/ / / | ||||||
* | | | | | | | am e70fbe8b: am 02b95105: fix transitions from hwc to GLES composition | Mathias Agopian | 2012-11-05 | 1 | -4/+4 | |
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | / / | |_|_|_|/ / |/| | | | | | ||||||
| * | | | | | am 02b95105: fix transitions from hwc to GLES composition | Mathias Agopian | 2012-11-05 | 1 | -4/+4 | |
| |\ \ \ \ \ | | |/ / / / | ||||||
| | * | | | | fix transitions from hwc to GLES composition | Mathias Agopian | 2012-11-05 | 1 | -4/+4 | |
| | | | | | | ||||||
| \ \ \ \ \ | ||||||
*-. \ \ \ \ \ | Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge | The Android Open Source Project | 2012-10-31 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | / / | | | |_|/ / | | |/| | | | ||||||
| | * | | | | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-30 | 0 | -0/+0 | |
| | |\ \ \ \ | | | |_|/ / | | |/| | | | ||||||
| | | * | | | partially implement external display clipping | Mathias Agopian | 2012-10-25 | 1 | -0/+25 | |
| | | * | | | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-25 | 0 | -0/+0 | |
| | | |\ \ \ | ||||||
| | | | * \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-22 | 0 | -0/+0 | |
| | | | |\ \ \ | ||||||
| | | | | * \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-20 | 0 | -0/+0 | |
| | | | | |\ \ \ | ||||||
| | | | | | * \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-19 | 0 | -0/+0 | |
| | | | | | |\ \ \ | ||||||
| | | | | | | * \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-18 | 0 | -0/+0 | |
| | | | | | | |\ \ \ | ||||||
| | | | | | | | * \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-17 | 0 | -0/+0 | |
| | | | | | | | |\ \ \ | ||||||
| | | | | | | | | * \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-16 | 0 | -0/+0 | |
| | | | | | | | | |\ \ \ | ||||||
| | | | | | | | | | * \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-16 | 0 | -0/+0 | |
| | | | | | | | | | |\ \ \ | ||||||
| * | | | | | | | | | | | | | Always set vertex alpha when drawing screenshot layers | Jesse Hall | 2012-10-22 | 1 | -1/+2 | |
| * | | | | | | | | | | | | | SurfaceFlinger: add animation transactions | Jamie Gennis | 2012-10-16 | 5 | -9/+55 | |
| * | | | | | | | | | | | | | merge in jb-mr1-factory-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-15 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ | am 742801c6: am 2281af96: dumpstate: add kernel memory fragmentation unusable... | Colin Cross | 2012-10-29 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | am 2281af96: dumpstate: add kernel memory fragmentation unusable index | Colin Cross | 2012-10-29 | 1 | -0/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | dumpstate: add kernel memory fragmentation unusable index | Colin Cross | 2012-10-28 | 1 | -0/+1 | |
* | | | | | | | | | | | | | | | am 78b4977e: Merge "Ensure that Vector::erase() returns a valid iterator" int... | Jason Simmons | 2012-10-25 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | Merge "Ensure that Vector::erase() returns a valid iterator" into jb-mr1-aah-dev | Jason Simmons | 2012-10-25 | 1 | -1/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Ensure that Vector::erase() returns a valid iterator | Jason Simmons | 2012-10-25 | 1 | -1/+2 | |
| | | |_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | am f45c5100: partially implement external display clipping | Mathias Agopian | 2012-10-25 | 1 | -0/+25 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | partially implement external display clipping | Mathias Agopian | 2012-10-25 | 1 | -0/+25 | |
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | am 04075569: Revert "Revert "put back the unused virtuals in Vector<>"" | Dave Burke | 2012-10-25 | 2 | -0/+39 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | Revert "Revert "put back the unused virtuals in Vector<>"" | Dave Burke | 2012-10-25 | 2 | -0/+39 | |
| |/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | | am d17e3b5f: prevent a client from crashing surfaceflinger | Mathias Agopian | 2012-10-22 | 1 | -2/+17 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | prevent a client from crashing surfaceflinger | Mathias Agopian | 2012-10-22 | 1 | -2/+17 |