diff options
author | Mark Salyzyn <salyzyn@google.com> | 2014-03-26 20:00:13 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-26 20:00:13 +0000 |
commit | 959bce3e69b4eb5dcba9ec48d92f21002f9c13b3 (patch) | |
tree | 8e71d7a5a2d69b24aaf5fe6e7d4395098a41fcde /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 39d1b3f0b887f37555924cc3737347b2c4044ce9 (diff) | |
parent | 4e3abafc9400eed38a1e76897b79e923acfaf8ed (diff) |
am 4e3abafc: am 5daf51c0: Merge "jni: 64-bit compile issue"
* commit '4e3abafc9400eed38a1e76897b79e923acfaf8ed':
jni: 64-bit compile issue
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions