summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/RenderScript.java
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2014-01-07 13:06:42 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-01-07 13:06:42 +0000
commit99aec6b5d1cb73a3f5b57badc53e6f56b2a53c4d (patch)
tree6451e5af4fcb3cd3b33a7111ee311bc1cc6e6f61 /rs/java/android/renderscript/RenderScript.java
parentd2098682ab269d311dd482a38e8557df6717ee17 (diff)
parent40b0aaa9201095f408551510ddd353dcf8c8ae26 (diff)
am 40b0aaa9: am 568cde55: am 80cff944: am 74675f29: Merge "AArch64: Use long for pointers in AmrInputStream"
* commit '40b0aaa9201095f408551510ddd353dcf8c8ae26': AArch64: Use long for pointers in AmrInputStream
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions