summaryrefslogtreecommitdiffstats
path: root/libs
Commit message (Expand)AuthorAgeFilesLines
* 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 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 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
* | | | | | am d51205fd: am 6afc5cf3: Merge "Prevent calling GL functions with an invalid...John Reck2014-12-011-1/+1
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge "Prevent calling GL functions with an invalid surface"John Reck2014-12-011-1/+1
| |\ \ \ \ \
| | * | | | | Prevent calling GL functions with an invalid surfaceSangkyu Lee2014-11-261-1/+1
* | | | | | | am 6eac26a4: am ca84c8b1: Merge "Revert "Force-use the pbuffer surface for de...Chris Craik2014-11-261-2/+1
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge "Revert "Force-use the pbuffer surface for destroy"" into lmp-mr1-devChris Craik2014-11-261-2/+1
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Revert "Force-use the pbuffer surface for destroy"Chris Craik2014-11-261-2/+1
* | | | | | | am 4e3404d9: am dec3f138: Merge "Force-use the pbuffer surface for destroy" i...John Reck2014-11-261-1/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Force-use the pbuffer surface for destroy" into lmp-mr1-devJohn Reck2014-11-251-1/+2
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Force-use the pbuffer surface for destroyJohn Reck2014-11-251-1/+2
* | | | | | | am 9c5b7b09: am ee660651: Merge "Improve DisplayList state output" into lmp-m...Chris Craik2014-11-263-3/+7
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Improve DisplayList state output" into lmp-mr1-devChris Craik2014-11-253-3/+7
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Improve DisplayList state outputChris Craik2014-11-213-3/+7
| | | |_|/ / | | |/| | |
* | | | | | am bf62d307: am af5bd75b: Merge "Enable stencil clipping within clearLayerReg...Chris Craik2014-11-261-7/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Enable stencil clipping within clearLayerRegionsDohyun Lee2014-11-241-7/+1
* | | | | | am 89a63f02: am 0c31d97a: Merge "Switch TextureCache to SkPixelRef::fStableId...John Reck2014-11-254-32/+30
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Switch TextureCache to SkPixelRef::fStableIdJohn Reck2014-11-244-32/+30
* | | | | | am 08e2fd72: am ff4dd15c: Merge "We HAVE_LITTLE_ENDIAN."Elliott Hughes2014-11-221-8/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | We HAVE_LITTLE_ENDIAN.Elliott Hughes2014-11-211-8/+0
| * | | | | Revert "Frameworks/base: Unused parameters in hwui"John Reck2014-11-2225-196/+180
* | | | | | am 1ae8a98e: am 29dc496a: Merge "Revert "Add a way to override Xfermode DO NO...Chris Craik2014-11-212-34/+12
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge "Revert "Add a way to override Xfermode DO NOT MERGE"" into lmp-mr1-devChris Craik2014-11-212-34/+12
| |\ \ \ \ \
| | * | | | | Revert "Add a way to override Xfermode DO NOT MERGE"Chris Craik2014-11-212-34/+12
* | | | | | | resolved conflicts for merge of 99377df1 to lmp-mr1-dev-plus-aospAndreas Gampe2014-11-2125-180/+192
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Frameworks/base: Unused parameters in hwuiAndreas Gampe2014-11-2125-180/+196
| | |_|_|/ / | |/| | | |
* | | | | | resolve merge conflicts of 57b641a to lmp-mr1-dev-plus-aosp.Chris Craik2014-11-209-36/+89
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge "Improve logging around performance critical events" into lmp-mr1-devChris Craik2014-11-209-37/+89
| |\ \ \ \ \
| | * | | | | Improve logging around performance critical eventsChris Craik2014-11-199-37/+89
| | | |_|/ / | | |/| | |
* | | | | | am d8c169fe: am 0c437fd3: Merge "Add appropriate casts for char16_t."Dan Albert2014-11-201-1/+2
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Add appropriate casts for char16_t.Dan Albert2014-11-201-1/+2
* | | | | | am decc26df: am f0f68117: Merge "Trace some interesting events" into lmp-mr1-devJohn Reck2014-11-184-0/+8
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge "Trace some interesting events" into lmp-mr1-devJohn Reck2014-11-184-0/+8
| |\ \ \ \ \
| | * | | | | Trace some interesting eventsJohn Reck2014-11-174-0/+8
* | | | | | | am a58336f6: Merge "Use fabsf() rather than abs()"Chih-hung Hsieh2014-11-171-1/+1
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Use fabsf() rather than abs()Bernhard Rosenkränzer2014-11-171-1/+1
* | | | | | | Merge commit '06d8b7b8' into manualmergeAdam Lesinski2014-11-173-3/+119
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge "Implement back-tracking when searching for attributes in XML or resour...Adam Lesinski2014-11-173-3/+119
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
generated by cgit v1.1 at 2025-01-12 21:00:36 +0000