summaryrefslogtreecommitdiffstats
path: root/libs
Commit message (Expand)AuthorAgeFilesLines
* am af6eaf65: Merge "Fix ANR caused by hwuiTask thread" automerge: 5ad36d4John Reck2015-02-044-13/+13
|\
| * Merge "Fix ANR caused by hwuiTask thread"John Reck2015-02-044-13/+13
| |\
| | * Fix ANR caused by hwuiTask threadSangkyu Lee2015-01-124-13/+13
* | | am 5f3e21ce: am 6efc3ac6: Merge "Allow ~Layer() to happen after onGLContextDe...John Reck2015-01-295-7/+26
|\ \ \
| * | | Allow ~Layer() to happen after onGLContextDestroyedJohn Reck2015-01-295-7/+26
* | | | am f7049289: am 3812e68e: Merge "kill HAVE_PTHREADS."Yabin Cui2015-01-272-10/+2
|\ \ \ \ | | |/ / | |/| |
| * | | kill HAVE_PTHREADS.Yabin Cui2015-01-262-10/+2
* | | | am aee7225e: Merge "Process base APK" into lmp-mr1-devAdam Lesinski2015-01-201-1/+7
|\ \ \ \ | | |/ / | |/| |
| * | | Process base APKAdam Lesinski2015-01-161-1/+7
* | | | am 996d3974: am ed35f5c7: Merge "Fast loadInverse() implementation for the co...Chris Craik2015-01-161-4/+32
|\ \ \ \ | | |/ / | |/| |
| * | | Fast loadInverse() implementation for the common caseRomain Guy2015-01-151-4/+32
* | | | Restore write_delete_fileBrian Carlstrom2015-01-141-0/+7
* | | | am 2c9f86aa: am 53af1cd3: Merge "Vsyncs are hard" into lmp-mr1-devJohn Reck2015-01-151-0/+8
|\ \ \ \ | | |/ / | |/| |
| * | | Merge "Vsyncs are hard" into lmp-mr1-devJohn Reck2015-01-151-0/+8
| |\ \ \
| | * | | Vsyncs are hardJohn Reck2015-01-141-0/+8
* | | | | am 9568307c: am 43a4a8c7: Fix redundant file backupsChristopher Tate2015-01-151-36/+41
|\ \ \ \ \ | |/ / / /
| * | | | Fix redundant file backupsChristopher Tate2015-01-141-38/+41
| |/ / /
* | | | am d6c475dc: am 595ae39f: Merge "Use more intention-revealing tests for S_ISL...Elliott Hughes2015-01-131-1/+3
|\ \ \ \ | | |/ / | |/| |
| * | | Use more intention-revealing tests for S_ISLNK and S_ISSOCK.Elliott Hughes2015-01-121-1/+3
| | |/ | |/|
* | | am 165fb8f5: am f89dac47: Merge "Tweak RT-animator scheduling" into lmp-mr1-devJohn Reck2014-12-194-15/+22
|\ \ \ | | |/ | |/|
| * | Tweak RT-animator schedulingJohn Reck2014-12-194-15/+22
* | | am 93492d1a: am c748832f: Merge "Revert overdraw avoidance visualization chan...Chris Craik2014-12-173-8/+13
|\ \ \ | |/ /
| * | Merge "Revert overdraw avoidance visualization change" into lmp-mr1-devChris Craik2014-12-173-8/+13
| |\ \
| | * | Revert overdraw avoidance visualization changeChris Craik2014-12-173-8/+13
* | | | Fix styleJohn Reck2014-12-1221-175/+175
* | | | am b9a4d15d: Merge "Force-flush state sync on texid change" into lmp-mr1-devJohn Reck2014-12-121-0/+6
|\ \ \ \ | |/ / /
| * | | Merge "Force-flush state sync on texid change" into lmp-mr1-devJohn Reck2014-12-111-0/+6
| |\ \ \
| | * | | Force-flush state sync on texid changeJohn Reck2014-12-111-0/+6
* | | | | am 63c7b246: Merge "Correct layer size formatting in trace" into lmp-mr1-devChris Craik2014-12-121-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Correct layer size formatting in trace" into lmp-mr1-devChris Craik2014-12-111-2/+2
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Correct layer size formatting in traceChris Craik2014-12-111-2/+2
| | |/ /
* | | | am eb2dcc79: Merge "Don\'t preload textures for AssetAtlas" into lmp-mr1-devJohn Reck2014-12-1111-73/+75
|\ \ \ \ | |/ / /
| * | | Merge "Don't preload textures for AssetAtlas" into lmp-mr1-devJohn Reck2014-12-1111-73/+75
| |\ \ \
| | * | | Don't preload textures for AssetAtlasJohn Reck2014-12-1011-73/+75
| | |/ /
* | | | am 740acf21: am c7801877: Merge "Fix issue where non-resource attributes woul...Adam Lesinski2014-12-111-0/+17
|\ \ \ \ | |/ / /
| * | | Merge "Fix issue where non-resource attributes would cause obtainStyleAttribu...Adam Lesinski2014-12-101-0/+17
| |\ \ \
| | * | | Fix issue where non-resource attributes would cause obtainStyleAttributes to ...Adam Lesinski2014-12-101-0/+17
* | | | | resolve merge conflicts of ed211b9 to lmp-mr1-dev-plus-aosp.Chris Craik2014-12-104-8/+19
|\ \ \ \ \ | |/ / / /
| * | | | Fix frame-allocated path lifecyclesChris Craik2014-12-104-8/+19
| | |/ / | |/| |
* | | | resolved conflicts for merge of fe11126d to lmp-mr1-dev-plus-aospJohn Reck2014-12-091-4/+6
|\ \ \ \ | |/ / /
| * | | Merge "Teach AssetAtlas about more drawables" into lmp-mr1-devJohn Reck2014-12-091-2/+4
| |\ \ \
| | * | | Teach AssetAtlas about more drawablesJohn Reck2014-12-091-2/+4
| | |/ /
* | | | am 497499b1: am 04c2bf4f: Merge "Remove unnecessary/erroneous reference count...Derek Sollenberger2014-12-091-8/+0
|\ \ \ \ | |/ / /
| * | | Remove unnecessary/erroneous reference countingDerek Sollenberger2014-12-091-8/+0
| |/ /
* | | Merge commit '0953ab27' into manualmergeAdam Lesinski2014-12-051-48/+57
|\ \ \ | |/ /
| * | Merge "AAPT: Move private attrs to new type for framework" into lmp-mr1-devAdam Lesinski2014-12-041-46/+57
| |\ \
| | * | AAPT: Move private attrs to new type for frameworkAdam Lesinski2014-12-031-46/+57
* | | | resolved conflicts for merge of a51a0901 to lmp-mr1-dev-plus-aospJohn Reck2014-12-046-12/+13
|\ \ \ \ | |/ / /
| * | | Resume RT-animations after a pauseSurfaceJohn Reck2014-12-036-12/+13
| |/ /
* | | am 503071ae: am a2b5067a: Merge "RRO: prevent duplicate system overlays"Adam Lesinski2014-12-041-0/+6
|\ \ \ | | |/ | |/|