diff options
author | Narayan Kamath <narayan@google.com> | 2014-01-16 15:38:15 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-16 15:38:15 +0000 |
commit | 775667c070f6e0375e7a247d30a34b0073d7fd5b (patch) | |
tree | b5b52e7eb328c5f5be9cf0f9d4edda611ece7c61 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 19bd2c28f9c3e4db12cad93ed2a69c17c95e42fd (diff) | |
parent | 03e8be757d2703d52fad3fd153c6bcf0b13ed1d1 (diff) |
am 03e8be75: am 8796ab7f: am bb35356d: Merge changes Id54087dd,I946325e4,I2a2b2e68
* commit '03e8be757d2703d52fad3fd153c6bcf0b13ed1d1':
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