diff options
| author | Narayan Kamath <narayan@google.com> | 2014-01-31 15:12:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-31 15:12:30 +0000 |
| commit | 3a5e470553a1a42647850b7c642f96961c2e4587 (patch) | |
| tree | 1009727e9d12a2d5f319295bb61a0074deba24e6 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 13701e4822d15e67bca1919ea1317312908f0bea (diff) | |
| parent | 5cdbac1e44aa85ccfedd19eb1a7376fe84b1ca72 (diff) | |
am 5cdbac1e: (-s ours) am 70986e19: am ab71f8b6: Merge "AArch64: Use of long for pointers in PropertyValuesHolder"
* commit '5cdbac1e44aa85ccfedd19eb1a7376fe84b1ca72':
AArch64: Use of long for pointers in PropertyValuesHolder
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions