| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | | | | Reconcile with jb-mr1.1-release - do not merge | The Android Open Source Project | 2012-11-28 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | ||||||
| | | * | | | | | merge in jb-mr1.1-release history after reset to jb-mr1.1-dev | The Android Automerger | 2012-11-27 | 0 | -0/+0 | |
| | | |\ \ \ \ \ | ||||||
| | | | * \ \ \ \ | merge in jb-mr1.1-release history after reset to jb-mr1.1-dev | The Android Automerger | 2012-11-26 | 0 | -0/+0 | |
| | | | |\ \ \ \ \ | ||||||
| | | | | * \ \ \ \ | merge in jb-mr1.1-release history after reset to jb-mr1.1-dev | The Android Automerger | 2012-11-19 | 0 | -0/+0 | |
| | | | | |\ \ \ \ \ | ||||||
| | | | | | * \ \ \ \ | merge in jb-mr1.1-release history after reset to jb-mr1.1-dev | The Android Automerger | 2012-11-19 | 0 | -0/+0 | |
| | | | | | |\ \ \ \ \ | ||||||
| | | | | | | * | | | | | workaround: don't reset compositionType to HWC_FRAMEBUFFER [DO NOT MERGE] | Mathias Agopian | 2012-11-19 | 1 | -1/+1 | |
| | | | | | | * | | | | | merge in jb-mr1.1-release history after reset to jb-mr1.1-dev | The Android Automerger | 2012-11-16 | 0 | -0/+0 | |
| | | | | | | |\ \ \ \ \ | | | | | |/ / / / / / | | | | |/| | | | | | | ||||||
| * | | | | | | | | | | | am a7da0dda: am 98cbec81: am efd614b8: Merge "make transform hint multi-displ... | Mathias Agopian | 2012-11-27 | 4 | -23/+64 | |
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | ||||||
| | * | | | | | | | | | | am 98cbec81: am efd614b8: Merge "make transform hint multi-display aware" int... | Mathias Agopian | 2012-11-27 | 4 | -23/+64 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | ||||||
| | | * | | | | | | | | | am efd614b8: Merge "make transform hint multi-display aware" into jb-mr1.1-dev | Mathias Agopian | 2012-11-27 | 4 | -23/+64 | |
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / | | | |/| | | | | | | | ||||||
| | | | * | | | | | | | | Merge "make transform hint multi-display aware" into jb-mr1.1-dev | Mathias Agopian | 2012-11-27 | 4 | -23/+64 | |
| | | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | | | ||||||
| | | | | * | | | | | | | make transform hint multi-display aware | Mathias Agopian | 2012-11-21 | 4 | -23/+64 | |
| * | | | | | | | | | | | am 1e310d64: am 2004307b: Merge "Create builtin display tokens on demand" | Jesse Hall | 2012-11-27 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | ||||||
| | * | | | | | | | | | | am 2004307b: Merge "Create builtin display tokens on demand" | Jesse Hall | 2012-11-27 | 2 | -25/+29 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ | 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 db2e4f16: (-s ours) am a90173d8: am 762a6d86: Merge "DO NOT MERGE - native... | Andy McFadden | 2012-11-27 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | / / | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | am a90173d8: am 762a6d86: Merge "DO NOT MERGE - native_fence_sync: fix an enu... | Andy McFadden | 2012-11-27 | 1 | -10/+11 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | ||||||
| | | * | | | | | | | | | am 762a6d86: Merge "DO NOT MERGE - native_fence_sync: fix an enum name" into ... | Andy McFadden | 2012-11-27 | 1 | -10/+11 | |
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | | | ||||||
| | | | * | | | | | | | | Merge "DO NOT MERGE - native_fence_sync: fix an enum name" into jb-mr1.1-dev | Andy McFadden | 2012-11-27 | 1 | -10/+11 | |
| | | | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | | | | | | ||||||
| | | | | * | | | | | | | DO NOT MERGE - native_fence_sync: fix an enum name | Jamie Gennis | 2012-11-26 | 1 | -10/+11 | |
| * | | | | | | | | | | | Merge "native_fence_sync: fix an enum name" | Jamie Gennis | 2012-11-26 | 1 | -10/+11 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | native_fence_sync: fix an enum name | Jamie Gennis | 2012-11-26 | 1 | -10/+11 | |
| * | | | | | | | | | | | | am 0e34af62: am c859084c: am a9a4cd48: gltrace: Make sure device is debuggable. | Siva Velusamy | 2012-11-20 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | | am c859084c: am a9a4cd48: gltrace: Make sure device is debuggable. | Siva Velusamy | 2012-11-20 | 1 | -0/+6 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | ||||||
| | | * | | | | | | | | | | am a9a4cd48: gltrace: Make sure device is debuggable. | Siva Velusamy | 2012-11-20 | 1 | -0/+6 | |
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | | | ||||||
| | | | * | | | | | | | | | gltrace: Make sure device is debuggable. | Siva Velusamy | 2012-11-20 | 1 | -0/+6 | |
| | | | | |_|_|/ / / / / | | | |/| | | | | | | | ||||||
| * | | | | | | | | | | | Merge "gltrace: Make sure device is debuggable." | Siva Velusamy | 2012-11-20 | 1 | -0/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | gltrace: Make sure device is debuggable. | Siva Velusamy | 2012-11-20 | 1 | -0/+6 | |
| * | | | | | | | | | | | | Merge "SurfaceFlinger: refactor frame time tracking" | Jamie Gennis | 2012-11-20 | 7 | -34/+320 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | SurfaceFlinger: refactor frame time tracking | Jamie Gennis | 2012-11-19 | 7 | -34/+320 | |
| | | |_|_|/ / / / / / / | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | | am b171fe9f: am 594a8773: am 764c197c: fix typo that broke all the builds | Mathias Agopian | 2012-11-20 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | ||||||
| | * | | | | | | | | | | am 594a8773: am 764c197c: fix typo that broke all the builds | Mathias Agopian | 2012-11-20 | 1 | -6/+3 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | ||||||
| | | * | | | | | | | | | am 764c197c: fix typo that broke all the builds | Mathias Agopian | 2012-11-19 | 1 | -6/+3 | |
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | | | ||||||
| | | | * | | | | | | | | fix typo that broke all the builds | Mathias Agopian | 2012-11-19 | 1 | -6/+3 | |
| * | | | | | | | | | | | fix typo that broke all the builds | Mathias Agopian | 2012-11-19 | 1 | -6/+3 | |
| | |_|_|/ / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | | Merge "SurfaceFlinger: track the HWC retire fences" | Jamie Gennis | 2012-11-19 | 2 | -2/+16 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | SurfaceFlinger: track the HWC retire fences | Jamie Gennis | 2012-11-19 | 2 | -2/+16 | |
| * | | | | | | | | | | | am c763303e: (-s ours) am 92c3a307: am 3e095b25: workaround: don\'t reset com... | Mathias Agopian | 2012-11-19 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | ||||||
| | * | | | | | | | | | | am 92c3a307: am 3e095b25: workaround: don\'t reset compositionType to HWC_FRA... | Mathias Agopian | 2012-11-19 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | ||||||
| | | * | | | | | | | | | am 3e095b25: workaround: don\'t reset compositionType to HWC_FRAMEBUFFER [DO ... | Mathias Agopian | 2012-11-19 | 1 | -1/+1 | |
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | | | ||||||
| | | | * | | | | | | | | workaround: don't reset compositionType to HWC_FRAMEBUFFER [DO NOT MERGE] | Mathias Agopian | 2012-11-19 | 1 | -1/+1 | |
| | | | | |_|_|_|/ / / | | | |/| | | | | | | ||||||
| * | | | | | | | | | | am c208cdd4: am 1d3612f1: am 2a8c49eb: fix an out-of-bounds memory access | Mathias Agopian | 2012-11-19 | 1 | -4/+6 | |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | ||||||
| | * | | | | | | | | | am 1d3612f1: am 2a8c49eb: fix an out-of-bounds memory access | Mathias Agopian | 2012-11-19 | 1 | -4/+6 | |
| | |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | ||||||
| | | * | | | | | | | | am 2a8c49eb: fix an out-of-bounds memory access | Mathias Agopian | 2012-11-19 | 1 | -4/+6 | |
| | | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | ||||||
| | | | * | | | | | | | fix an out-of-bounds memory access | Mathias Agopian | 2012-11-15 | 1 | -4/+6 | |
| | | | | |_|_|/ / / | | | |/| | | | | | ||||||
| * | | | | | | | | | am 35d39886: am f9730c3b: am ee932d0a: Reset compositionType to HWC_FRAMEBUFF... | Mathias Agopian | 2012-11-14 | 3 | -1/+5 | |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | ||||||
| | * | | | | | | | | am f9730c3b: am ee932d0a: Reset compositionType to HWC_FRAMEBUFFER before cal... | Mathias Agopian | 2012-11-14 | 3 | -1/+5 | |
| | |\ \ \ \ \ \ \ \ | | |/ / / / / / / | ||||||
| | | * | | | | | | | am ee932d0a: Reset compositionType to HWC_FRAMEBUFFER before calling prepare() | Mathias Agopian | 2012-11-14 | 3 | -1/+5 | |
| | | |\ \ \ \ \ \ \ | | | |/ / / / / / | ||||||
| | | | * | | | | | | Reset compositionType to HWC_FRAMEBUFFER before calling prepare() | Mathias Agopian | 2012-11-14 | 3 | -1/+5 | |
| | | | | |/ / / / | | | |/| | | | | ||||||
 |
index : frameworks_native.git | |
| frameworks/native | git repository hosting |
| summaryrefslogtreecommitdiffstats |