diff options
author | Mark Salyzyn <salyzyn@google.com> | 2014-03-26 12:56:02 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-26 12:56:02 -0700 |
commit | 4e3abafc9400eed38a1e76897b79e923acfaf8ed (patch) | |
tree | 6b7cdfcab7b61a544d76acb3cf2999ced13326e5 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | fdd6351067740f80148ff03c43d2ebc91f1d9656 (diff) | |
parent | 5daf51c0fe6d5bea858c37291fed88bd3094d3ec (diff) |
am 5daf51c0: Merge "jni: 64-bit compile issue"
* commit '5daf51c0fe6d5bea858c37291fed88bd3094d3ec':
jni: 64-bit compile issue
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions