summaryrefslogtreecommitdiffstats
path: root/libs
Commit message (Expand)AuthorAgeFilesLines
* am ec9b598c: am b9a4d15d: Merge "Force-flush state sync on texid change" into...John Reck2014-12-121-0/+6
|\
| * 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 3f454e7d: am 63c7b246: Merge "Correct layer size formatting in trace" into...Chris Craik2014-12-121-2/+2
|\ \ \ \ | |/ / /
| * | | 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
* | | | resolved conflicts for merge of d67bb501 to masterYohann Roussel2014-12-1111-73/+76
|\ \ \ \ | |/ / /
| * | | 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 347040cf: am 740acf21: am c7801877: Merge "Fix issue where non-resource at...Adam Lesinski2014-12-111-0/+17
|\ \ \ \ | |/ / /
| * | | 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
* | | | | resolved conflicts for merge of 5369b769 to masterChris Craik2014-12-104-8/+19
|\ \ \ \ \ | |/ / / /
| * | | | 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 3bae94d7 to masterNick Kralevich2014-12-101-2/+4
|\ \ \ \ | |/ / /
| * | | 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 1f78b336: am 497499b1: am 04c2bf4f: Merge "Remove unnecessary/erroneous re...Derek Sollenberger2014-12-091-8/+0
|\ \ \ \ | |/ / /
| * | | 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
| | |/
* | | am e97908d3: Merge commit \'0953ab27\' into manualmergeAdam Lesinski2014-12-051-48/+57
|\ \ \ | |/ /
| * | 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 a75b0ad3 to masterJohn Reck2014-12-046-12/+13
|\ \ \ \ | |/ / /
| * | | 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 8e5362f2: am 503071ae: am a2b5067a: Merge "RRO: prevent duplicate system o...Adam Lesinski2014-12-041-0/+6
|\ \ \ | |/ /
| * | am 503071ae: am a2b5067a: Merge "RRO: prevent duplicate system overlays"Adam Lesinski2014-12-041-0/+6
| |\ \
| | * \ Merge "RRO: prevent duplicate system overlays"Adam Lesinski2014-12-031-0/+6
| | |\ \
| | | * | RRO: prevent duplicate system overlaysMårten Kongstad2014-11-071-0/+6
* | | | | am 9438ad15: am e580d661: am e89a2865: Merge changes If2c7e09f,Ie21f227cAdam Lesinski2014-12-032-5/+9
|\ \ \ \ \ | |/ / / /
| * | | | am e580d661: am e89a2865: Merge changes If2c7e09f,Ie21f227cAdam Lesinski2014-12-022-5/+9
| |\ \ \ \ | | |/ / /
| | * | | Merge changes If2c7e09f,Ie21f227cAdam Lesinski2014-12-022-5/+9
| | |\ \ \ | | | |/ /
| | | * | RRO idmap: pad with 0xffffffff, not 0x00000000Mårten Kongstad2014-11-071-5/+5
| | | * | RRO: reintroduce lost ResTable insert of assetsMårten Kongstad2014-11-071-0/+4
* | | | | am a22ab0da: am 9a04480e: am ef124887: Merge "Clip outline to View clip bound...Chris Craik2014-12-021-4/+23
|\ \ \ \ \ | |/ / / /
| * | | | am 9a04480e: am ef124887: Merge "Clip outline to View clip bounds for shadow ...Chris Craik2014-12-021-4/+23
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge "Clip outline to View clip bounds for shadow computation" into lmp-mr1-devChris Craik2014-12-021-4/+23
| | |\ \ \
| | | * | | Clip outline to View clip bounds for shadow computationChris Craik2014-12-011-4/+23
| | * | | | Merge "Prevent calling GL functions with an invalid surface" into lmp-mr1-devJohn Reck2014-12-011-1/+1
| | |\ \ \ \
| | | * | | | Prevent calling GL functions with an invalid surfaceSangkyu Lee2014-12-011-1/+1
| | * | | | | Merge "Enable stencil clipping within clearLayerRegions" into lmp-mr1-devChris Craik2014-12-011-7/+1
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Enable stencil clipping within clearLayerRegionsDohyun Lee2014-11-261-7/+1
generated by cgit v1.1 at 2025-02-13 17:06:20 +0000