summaryrefslogtreecommitdiffstats
path: root/libs
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | 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 5ab86ba0: am 89a63f02: am 0c31d97a: Merge "Switch TextureCache to SkPixelR...John Reck2014-11-254-32/+30
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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
* | | | | | | Merge "Cast buffer width and height to int"Dan Stoza2014-11-251-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Cast buffer width and height to intDan Stoza2014-11-211-2/+2
* | | | | | | | am ee46d162: am 08e2fd72: am ff4dd15c: Merge "We HAVE_LITTLE_ENDIAN."Elliott Hughes2014-11-221-8/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | 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
* | | | | | | | | Revert "resolved conflicts for merge of 220c3f4f to master"Andreas Gampe2014-11-2225-187/+176
* | | | | | | | | resolved conflicts for merge of 220c3f4f to masterAndreas Gampe2014-11-2125-176/+187
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | 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
| | | |_|_|_|/ / | | |/| | | | |
* | | | | | | | Merge "Revert "Add a way to override Xfermode""Chris Craik2014-11-212-22/+3
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Revert "Add a way to override Xfermode"Chris Craik2014-11-212-22/+3
* | | | | | | | resolve merge conflicts of f2235b6 to master.Chris Craik2014-11-209-36/+89
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | 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 582bdf9a: am d8c169fe: am 0c437fd3: Merge "Add appropriate casts for char1...Dan Albert2014-11-201-1/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | 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 842697a3: am decc26df: am f0f68117: Merge "Trace some interesting events" ...John Reck2014-11-184-0/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | 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 cb82b7f1: am a58336f6: Merge "Use fabsf() rather than abs()"Chih-hung Hsieh2014-11-171-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | 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 "Fix uninitialized member warning"Rob Tsuk2014-11-171-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix uninitialized member warningRob Tsuk2014-11-171-0/+1
* | | | | | | | | | am 11bdd5b1: Merge commit \'06d8b7b8\' into manualmergeAdam Lesinski2014-11-173-3/+119
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | | * | | | | | | Implement back-tracking when searching for attributes in XML or resource bagAdam Lesinski2014-11-043-3/+119
| * | | | | | | | | am 52e2b6f7: Merge "Update calls to IInterface::asBinder()"Marco Nelissen2014-11-172-10/+10
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | * | | | | | | | Update calls to IInterface::asBinder()Marco Nelissen2014-11-172-10/+10
| * | | | | | | | | am ccc956b2: am 41a8043b: Merge "Add a way to override Xfermode DO NOT MERGE"...Rob Tsuk2014-11-122-12/+34
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge "Add a way to override Xfermode DO NOT MERGE" into lmp-mr1-devRob Tsuk2014-11-122-12/+34
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / | | | |/| | | | | |
| | | * | | | | | | Add a way to override Xfermode DO NOT MERGERob Tsuk2014-11-122-12/+34
| | | | |_|_|/ / / | | | |/| | | | |
* | | | | | | | | Merge "Move hwui tests to libc++."Dan Albert2014-11-161-1/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Move hwui tests to libc++.Dan Albert2014-11-151-1/+0
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Update calls to IInterface::asBinder()Marco Nelissen2014-11-142-10/+10
|/ / / / / / / /
* | | | | | | | Merge "Fix warnings in hwiu test app"Rob Tsuk2014-11-132-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix warnings in hwiu test appRob Tsuk2014-11-122-1/+2