Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | am bf62d307: am af5bd75b: Merge "Enable stencil clipping within clearLayerReg... | Chris Craik | 2014-11-26 | 1 | -7/+1 | |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | ||||||
| | * | | | | | Enable stencil clipping within clearLayerRegions | Dohyun Lee | 2014-11-24 | 1 | -7/+1 | |
* | | | | | | | am 5ab86ba0: am 89a63f02: am 0c31d97a: Merge "Switch TextureCache to SkPixelR... | John Reck | 2014-11-25 | 4 | -32/+30 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | am 89a63f02: am 0c31d97a: Merge "Switch TextureCache to SkPixelRef::fStableId... | John Reck | 2014-11-25 | 4 | -32/+30 | |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | ||||||
| | * | | | | | Switch TextureCache to SkPixelRef::fStableId | John Reck | 2014-11-24 | 4 | -32/+30 | |
* | | | | | | | Merge "Cast buffer width and height to int" | Dan Stoza | 2014-11-25 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Cast buffer width and height to int | Dan Stoza | 2014-11-21 | 1 | -2/+2 | |
* | | | | | | | | am ee46d162: am 08e2fd72: am ff4dd15c: Merge "We HAVE_LITTLE_ENDIAN." | Elliott Hughes | 2014-11-22 | 1 | -8/+0 | |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | ||||||
| * | | | | | | | am 08e2fd72: am ff4dd15c: Merge "We HAVE_LITTLE_ENDIAN." | Elliott Hughes | 2014-11-22 | 1 | -8/+0 | |
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | ||||||
| | * | | | | | | We HAVE_LITTLE_ENDIAN. | Elliott Hughes | 2014-11-21 | 1 | -8/+0 | |
| | * | | | | | | Revert "Frameworks/base: Unused parameters in hwui" | John Reck | 2014-11-22 | 25 | -196/+180 | |
| * | | | | | | | am 1ae8a98e: am 29dc496a: Merge "Revert "Add a way to override Xfermode DO NO... | Chris Craik | 2014-11-21 | 2 | -34/+12 | |
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | ||||||
| | * | | | | | | Merge "Revert "Add a way to override Xfermode DO NOT MERGE"" into lmp-mr1-dev | Chris Craik | 2014-11-21 | 2 | -34/+12 | |
| | |\ \ \ \ \ \ | ||||||
| | | * | | | | | | Revert "Add a way to override Xfermode DO NOT MERGE" | Chris Craik | 2014-11-21 | 2 | -34/+12 | |
* | | | | | | | | | Revert "resolved conflicts for merge of 220c3f4f to master" | Andreas Gampe | 2014-11-22 | 25 | -187/+176 | |
* | | | | | | | | | resolved conflicts for merge of 220c3f4f to master | Andreas Gampe | 2014-11-21 | 25 | -176/+187 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | ||||||
| * | | | | | | | | resolved conflicts for merge of 99377df1 to lmp-mr1-dev-plus-aosp | Andreas Gampe | 2014-11-21 | 25 | -180/+192 | |
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | ||||||
| | * | | | | | | | Frameworks/base: Unused parameters in hwui | Andreas Gampe | 2014-11-21 | 25 | -180/+196 | |
| | | |_|_|_|/ / | | |/| | | | | | ||||||
* | | | | | | | | Merge "Revert "Add a way to override Xfermode"" | Chris Craik | 2014-11-21 | 2 | -22/+3 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | ||||||
| * | | | | | | | Revert "Add a way to override Xfermode" | Chris Craik | 2014-11-21 | 2 | -22/+3 | |
* | | | | | | | | resolve merge conflicts of f2235b6 to master. | Chris Craik | 2014-11-20 | 9 | -36/+89 | |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | ||||||
| * | | | | | | | resolve merge conflicts of 57b641a to lmp-mr1-dev-plus-aosp. | Chris Craik | 2014-11-20 | 9 | -36/+89 | |
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | ||||||
| | * | | | | | | Merge "Improve logging around performance critical events" into lmp-mr1-dev | Chris Craik | 2014-11-20 | 9 | -37/+89 | |
| | |\ \ \ \ \ \ | ||||||
| | | * | | | | | | Improve logging around performance critical events | Chris Craik | 2014-11-19 | 9 | -37/+89 | |
| | | | |_|_|/ / | | | |/| | | | | ||||||
* | | | | | | | | am 582bdf9a: am d8c169fe: am 0c437fd3: Merge "Add appropriate casts for char1... | Dan Albert | 2014-11-20 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | am d8c169fe: am 0c437fd3: Merge "Add appropriate casts for char16_t." | Dan Albert | 2014-11-20 | 1 | -1/+2 | |
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | ||||||
| | * | | | | | | Add appropriate casts for char16_t. | Dan Albert | 2014-11-20 | 1 | -1/+2 | |
* | | | | | | | | am 842697a3: am decc26df: am f0f68117: Merge "Trace some interesting events" ... | John Reck | 2014-11-18 | 4 | -0/+8 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | am decc26df: am f0f68117: Merge "Trace some interesting events" into lmp-mr1-dev | John Reck | 2014-11-18 | 4 | -0/+8 | |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | ||||||
| | * | | | | | | Merge "Trace some interesting events" into lmp-mr1-dev | John Reck | 2014-11-18 | 4 | -0/+8 | |
| | |\ \ \ \ \ \ | ||||||
| | | * | | | | | | Trace some interesting events | John Reck | 2014-11-17 | 4 | -0/+8 | |
* | | | | | | | | | am cb82b7f1: am a58336f6: Merge "Use fabsf() rather than abs()" | Chih-hung Hsieh | 2014-11-17 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | ||||||
| * | | | | | | | | am a58336f6: Merge "Use fabsf() rather than abs()" | Chih-hung Hsieh | 2014-11-17 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | ||||||
| | * | | | | | | | Use fabsf() rather than abs() | Bernhard Rosenkränzer | 2014-11-17 | 1 | -1/+1 | |
* | | | | | | | | | Merge "Fix uninitialized member warning" | Rob Tsuk | 2014-11-17 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fix uninitialized member warning | Rob Tsuk | 2014-11-17 | 1 | -0/+1 | |
* | | | | | | | | | | am 11bdd5b1: Merge commit \'06d8b7b8\' into manualmerge | Adam Lesinski | 2014-11-17 | 3 | -3/+119 | |
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | ||||||
| * | | | | | | | | | Merge commit '06d8b7b8' into manualmerge | Adam Lesinski | 2014-11-17 | 3 | -3/+119 | |
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | ||||||
| | * | | | | | | | | Merge "Implement back-tracking when searching for attributes in XML or resour... | Adam Lesinski | 2014-11-17 | 3 | -3/+119 | |
| | |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | | | ||||||
| | | * | | | | | | | Implement back-tracking when searching for attributes in XML or resource bag | Adam Lesinski | 2014-11-04 | 3 | -3/+119 | |
| * | | | | | | | | | am 52e2b6f7: Merge "Update calls to IInterface::asBinder()" | Marco Nelissen | 2014-11-17 | 2 | -10/+10 | |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | | | ||||||
| | * | | | | | | | | Update calls to IInterface::asBinder() | Marco Nelissen | 2014-11-17 | 2 | -10/+10 | |
| * | | | | | | | | | am ccc956b2: am 41a8043b: Merge "Add a way to override Xfermode DO NOT MERGE"... | Rob Tsuk | 2014-11-12 | 2 | -12/+34 | |
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | ||||||
| | * | | | | | | | | Merge "Add a way to override Xfermode DO NOT MERGE" into lmp-mr1-dev | Rob Tsuk | 2014-11-12 | 2 | -12/+34 | |
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / | | | |/| | | | | | | ||||||
| | | * | | | | | | | Add a way to override Xfermode DO NOT MERGE | Rob Tsuk | 2014-11-12 | 2 | -12/+34 | |
| | | | |_|_|/ / / | | | |/| | | | | | ||||||
* | | | | | | | | | Merge "Move hwui tests to libc++." | Dan Albert | 2014-11-16 | 1 | -1/+0 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Move hwui tests to libc++. | Dan Albert | 2014-11-15 | 1 | -1/+0 | |
| | |_|_|_|_|/ / / | |/| | | | | | | | ||||||
* | | | | | | | | | Update calls to IInterface::asBinder() | Marco Nelissen | 2014-11-14 | 2 | -10/+10 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge "Fix warnings in hwiu test app" | Rob Tsuk | 2014-11-13 | 2 | -1/+2 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fix warnings in hwiu test app | Rob Tsuk | 2014-11-12 | 2 | -1/+2 |