Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am 87e9e744: am 92a32832: DO NOT MERGE - Fix Javadoc build break. | Leon Scroggins III | 2014-03-07 | 1 | -1/+1 |
|\ | |||||
| * | 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 |
* | | | 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 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-03-07 | 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-03-07 | 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-03-07 | 30 | -484/+490 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | am b4cf2a2a: Merge "Convert Java/JNI to 64-bit, part 2." | Tim Murray | 2014-02-03 | 30 | -484/+490 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Convert Java/JNI to 64-bit, part 2. | Tim Murray | 2014-01-31 | 30 | -484/+490 |
* | | | | | | | am 72d637e2: am e22e268e: Merge changes If93a5d78,I1957f7ac | Tim Murray | 2014-03-07 | 4 | -485/+480 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am e22e268e: Merge changes If93a5d78,I1957f7ac | Tim Murray | 2014-02-03 | 4 | -485/+480 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Convert Java/JNI to 64-bit, part 1. | Tim Murray | 2014-01-31 | 3 | -444/+444 |
| | * | | | | | Add long/double read support. | Jason Sams | 2014-01-31 | 3 | -53/+48 |
* | | | | | | | am bccee732: am 61eb6b55: Merge "Use Object + type in place of specific array" | Tim Murray | 2014-03-07 | 3 | -195/+97 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am 61eb6b55: Merge "Use Object + type in place of specific array" | Tim Murray | 2014-02-03 | 3 | -195/+97 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Use Object + type in place of specific array | Jason Sams | 2014-01-31 | 3 | -195/+97 |
* | | | | | | | am 69914882: am e559d7ee: Merge "Utility API for creating types." | Tim Murray | 2014-03-07 | 1 | -0/+75 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am e559d7ee: Merge "Utility API for creating types." | Tim Murray | 2014-02-03 | 1 | -0/+75 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Utility API for creating types. | Jason Sams | 2014-01-31 | 1 | -0/+75 |
* | | | | | | | am 271c3b74: am b1c1518e: Merge "Remove old hidden API." | Tim Murray | 2014-03-07 | 1 | -8/+0 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am b1c1518e: Merge "Remove old hidden API." | Tim Murray | 2014-02-03 | 1 | -8/+0 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Remove old hidden API. | Jason Sams | 2014-01-31 | 1 | -8/+0 |
* | | | | | | | am 9bad32c3: am aea3b581: Merge "Remove hidden API setSurfaceTexture." | Tim Murray | 2014-03-07 | 1 | -13/+5 |
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | | | |||||
| * | | | | | am aea3b581: Merge "Remove hidden API setSurfaceTexture." | Tim Murray | 2014-02-03 | 1 | -13/+5 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Remove hidden API setSurfaceTexture. | Jason Sams | 2014-01-31 | 1 | -13/+5 |
| | |/ / / | |||||
* | | | | | am 7be33110: am d4ccffd3: Merge "AArch64: Use long for pointers in graphics/I... | Narayan Kamath | 2014-01-29 | 1 | -7/+7 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | am d4ccffd3: Merge "AArch64: Use long for pointers in graphics/Interpolator" | Narayan Kamath | 2014-01-29 | 1 | -7/+7 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge "AArch64: Use long for pointers in graphics/Interpolator" | Narayan Kamath | 2014-01-29 | 1 | -7/+7 |
| | |\ \ \ | |||||
| | | * | | | AArch64: Use long for pointers in graphics/Interpolator | Ashok Bhat | 2014-01-16 | 1 | -7/+7 |
* | | | | | | am 74db9ddb: am 887b1ca8: Merge "AArch64: Use long for pointers in SurfaceTex... | Narayan Kamath | 2014-01-29 | 1 | -3/+3 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | am 887b1ca8: Merge "AArch64: Use long for pointers in SurfaceTexture" | Narayan Kamath | 2014-01-29 | 1 | -3/+3 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge "AArch64: Use long for pointers in SurfaceTexture" | Narayan Kamath | 2014-01-29 | 1 | -3/+3 |
| | |\ \ \ \ | |||||
| | | * | | | | AArch64: Use long for pointers in SurfaceTexture | Ashok Bhat | 2014-01-16 | 1 | -3/+3 |
| | | |/ / / | |||||
* | | | | | | am 23abbfbb: am 154614ab: Merge "AArch64: Use long for pointers in graphics/C... | Narayan Kamath | 2014-01-28 | 1 | -5/+5 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | am 154614ab: Merge "AArch64: Use long for pointers in graphics/Camera" | Narayan Kamath | 2014-01-28 | 1 | -5/+5 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | AArch64: Use long for pointers in graphics/Camera | Ashok Bhat | 2014-01-28 | 1 | -5/+5 |
* | | | | | | am aa9ba887: am 6e09eb4c: Merge "AArch64: Make graphics classes 64-bit compat... | Narayan Kamath | 2014-01-28 | 42 | -401/+429 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | am 6e09eb4c: Merge "AArch64: Make graphics classes 64-bit compatible" | Narayan Kamath | 2014-01-28 | 42 | -401/+429 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | AArch64: Make graphics classes 64-bit compatible | Ashok Bhat | 2014-01-28 | 42 | -401/+429 |
| | |/ / / | |||||
* | | | | | am caea42fd: am 98002dfb: Merge "AArch64: Use long for pointers in graphics/P... | Narayan Kamath | 2014-01-16 | 1 | -10/+10 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | am 98002dfb: Merge "AArch64: Use long for pointers in graphics/PathMeasure" | Narayan Kamath | 2014-01-16 | 1 | -10/+10 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge "AArch64: Use long for pointers in graphics/PathMeasure" | Narayan Kamath | 2014-01-16 | 1 | -10/+10 |
| | |\ \ \ | |||||
| | | * | | | AArch64: Use long for pointers in graphics/PathMeasure | Ashok Bhat | 2014-01-13 | 1 | -10/+10 |
* | | | | | | am 8796ab7f: am bb35356d: Merge changes Id54087dd,I946325e4,I2a2b2e68 | Narayan Kamath | 2014-01-16 | 2 | -13/+13 |
|\ \ \ \ \ \ | |/ / / / / |