diff options
author | Narayan Kamath <narayan@google.com> | 2014-01-16 07:35:06 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-16 07:35:06 -0800 |
commit | 03e8be757d2703d52fad3fd153c6bcf0b13ed1d1 (patch) | |
tree | 3d754836e4e1a829594b6b072e621b956cda54b5 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | ab220deeb8a413649335d5ef47d974dfdc3ac5ec (diff) | |
parent | 8796ab7f22d3e9f5b85571e8851851c023416f96 (diff) |
am 8796ab7f: am bb35356d: Merge changes Id54087dd,I946325e4,I2a2b2e68
* commit '8796ab7f22d3e9f5b85571e8851851c023416f96':
AArch64: Use long for pointers in BitmapRegionDecoder
AArch64: Use long for pointers in Movie class
AArch64: Add AssetInputStream.getNativeAsset
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions