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