Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am d05c7d26: am bcf76242: Merge "Move FLATTENED_PATTERN to inner class." | Ian Rogers | 2014-05-14 | 1 | -2/+14 |
|\ | |||||
| * | am bcf76242: Merge "Move FLATTENED_PATTERN to inner class." | Ian Rogers | 2014-05-14 | 1 | -2/+14 |
| |\ | |||||
| | * | Move FLATTENED_PATTERN to inner class. | Ian Rogers | 2014-05-14 | 1 | -2/+14 |
| * | | am fc603ca6: am abf701e6: Merge "Eliminate mHasAlpha" into klp-dev | John Reck | 2014-03-21 | 1 | -15/+3 |
| |\ \ | |||||
| * \ \ | am 87e9e744: am 92a32832: DO NOT MERGE - Fix Javadoc build break. | Leon Scroggins III | 2014-03-07 | 1 | -1/+1 |
| |\ \ \ | |||||
| * \ \ \ | Merge "resolved conflicts for merge of 8d3281f5 to klp-dev-plus-aosp" into kl... | Leon Scroggins III | 2014-03-07 | 2 | -12/+45 |
| |\ \ \ \ | |||||
| | * \ \ \ | resolved conflicts for merge of 8d3281f5 to klp-dev-plus-aosp | Leon Scroggins III | 2014-03-06 | 2 | -12/+45 |
| | |\ \ \ \ | |||||
| * | \ \ \ \ | am b90fc64b: am f44a3f1e: Merge "Use long for pointers in EmojiFactory and Pd... | Narayan Kamath | 2014-03-07 | 1 | -7/+7 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| * | | | | | | am 16e9362e: am 8fced317: Merge "Move RenderScript from graphics/ to new fw/b... | Tim Murray | 2014-03-07 | 63 | -23697/+0 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | am 8df3ea66: am b4cf2a2a: Merge "Convert Java/JNI to 64-bit, part 2." | Tim Murray | 2014-03-07 | 30 | -484/+490 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | am 72d637e2: am e22e268e: Merge changes If93a5d78,I1957f7ac | Tim Murray | 2014-03-07 | 4 | -485/+480 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | am bccee732: am 61eb6b55: Merge "Use Object + type in place of specific array" | Tim Murray | 2014-03-07 | 3 | -195/+97 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | am 69914882: am e559d7ee: Merge "Utility API for creating types." | Tim Murray | 2014-03-07 | 1 | -0/+75 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | am 271c3b74: am b1c1518e: Merge "Remove old hidden API." | Tim Murray | 2014-03-07 | 1 | -8/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | am 9bad32c3: am aea3b581: Merge "Remove hidden API setSurfaceTexture." | Tim Murray | 2014-03-07 | 1 | -13/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | am 38f407cb: Merge "RenderScript bicubic resize intrinsic [DO NOT MERGE]" int... | Jason Sams | 2014-04-16 | 1 | -0/+112 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | RenderScript bicubic resize intrinsic [DO NOT MERGE] | Jason Sams | 2014-04-16 | 1 | -0/+112 |
* | | | | | | | | | | | | | | am ecaea7e6: Merge "Force refresh of stateful when a child drawable is change... | Craig Stout | 2014-03-31 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | Force refresh of stateful when a child drawable is changed. | Craig Stout | 2014-03-27 | 1 | -0/+1 |
* | | | | | | | | | | | | | | am aff40e25: am fc603ca6: am abf701e6: Merge "Eliminate mHasAlpha" into klp-dev | John Reck | 2014-03-21 | 1 | -15/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | am fc603ca6: am abf701e6: Merge "Eliminate mHasAlpha" into klp-dev | John Reck | 2014-03-21 | 1 | -15/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | am abf701e6: Merge "Eliminate mHasAlpha" into klp-dev | John Reck | 2014-03-21 | 1 | -15/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | Eliminate mHasAlpha | John Reck | 2014-03-21 | 1 | -15/+3 |
* | | | | | | | | | | | | | | | am 889a1ddd: Fix JavaDoc | Ben Murdoch | 2014-03-17 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | Fix JavaDoc | Ben Murdoch | 2014-03-17 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | am 01252217: Merge "Fix javadoc." into klp-modular-dev | Torne (Richard Coles) | 2014-03-17 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | Fix javadoc. | Torne (Richard Coles) | 2014-03-17 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | am f8d8777d: Update framework to use M33 Skia. DO NOT MERGE | Leon Scroggins III | 2014-03-17 | 2 | -12/+45 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | Update framework to use M33 Skia. DO NOT MERGE | Leon Scroggins III | 2014-03-17 | 2 | -12/+45 |
| * | | | | | | | | | | | | | | Force merge of remaining KLP changes to fix build. | Jason Sams | 2014-03-13 | 1 | -3/+19 |
| * | | | | | | | | | | | | | | Fix build issues from bad merge | Jason Sams | 2014-03-13 | 1 | -7/+8 |
| * | | | | | | | | | | | | | | resolved conflicts for merge of 780d57b8 to klp-modular-dev | Jason Sams | 2014-03-13 | 2 | -4/+15 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | am cf8573c1: Fix destruction issues relating to AllocationAdapter. | Jason Sams | 2014-03-11 | 2 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | |||||
| | | * | | | | | | | | | | | | Fix destruction issues relating to AllocationAdapter. | Jason Sams | 2014-03-10 | 2 | -2/+2 |
| * | | | | | | | | | | | | | | am e14d5e90: am 5757bf89: Add hidden minor version ID for support lib workaro... | Jason Sams | 2014-03-13 | 1 | -0/+14 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | | | | / / / / / / / / / / / | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | am 5757bf89: Add hidden minor version ID for support lib workarounds. | Jason Sams | 2014-03-11 | 1 | -0/+14 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | |||||
| | | * | | | | | | | | | | | Add hidden minor version ID for support lib workarounds. | Jason Sams | 2014-03-10 | 1 | -0/+14 |
| | * | | | | | | | | | | | | am ff7256e7: Fix destruction issues relating to AllocationAdapter. | Jason Sams | 2014-03-11 | 2 | -13/+41 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | | | | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |||||
| | | * | | | | | | | | | | Fix destruction issues relating to AllocationAdapter. | Jason Sams | 2014-03-10 | 2 | -13/+41 |
| | * | | | | | | | | | | | am 92a32832: DO NOT MERGE - Fix Javadoc build break. | Leon Scroggins III | 2014-03-06 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | | | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |||||
| | | * | | | | | | | | | DO NOT MERGE - Fix Javadoc build break. | Leon Scroggins III | 2014-03-06 | 1 | -1/+1 |
| | * | | | | | | | | | | am ee008d42: Merge "Update framework to use M33 Skia. DO NOT MERGE" into klp-dev | Leon Scroggins III | 2014-03-06 | 2 | -12/+45 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | |||||
| | | * | | | | | | | | | Update framework to use M33 Skia. DO NOT MERGE | Leon Scroggins III | 2014-03-06 | 2 | -12/+45 |
* | | | | | | | | | | | | am b90fc64b: am f44a3f1e: Merge "Use long for pointers in EmojiFactory and Pd... | Narayan Kamath | 2014-02-11 | 1 | -7/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge "Use long for pointers in EmojiFactory and PdfDocument" | Narayan Kamath | 2014-02-11 | 1 | -7/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | Use long for pointers in EmojiFactory and PdfDocument | Ashok Bhat | 2014-01-31 | 1 | -7/+7 |
* | | | | | | | | | | | | am 16e9362e: am 8fced317: Merge "Move RenderScript from graphics/ to new fw/b... | Tim Murray | 2014-02-03 | 63 | -23697/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | Move RenderScript from graphics/ to new fw/base subdirectory rs. | Tim Murray | 2014-01-31 | 63 | -23697/+0 |
* | | | | | | | | | | | | am 8df3ea66: am b4cf2a2a: Merge "Convert Java/JNI to 64-bit, part 2." | Tim Murray | 2014-02-03 | 30 | -484/+490 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | am b4cf2a2a: Merge "Convert Java/JNI to 64-bit, part 2." | Tim Murray | 2014-02-03 | 30 | -484/+490 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |