diff options
author | Narayan Kamath <narayan@google.com> | 2014-01-16 15:57:47 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-16 15:57:47 +0000 |
commit | 6606d16e097480e061546306cc95a729f5dccae8 (patch) | |
tree | 8eec8ce5ec5dc334c1ca01d45a5f63ce944673cd /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | a3340da7d4ef3872bd1191fcd4bf8b25d1179a25 (diff) | |
parent | 6706888e24aee04c2c914c44e5ef5b1510cf8013 (diff) |
am 6706888e: am 775667c0: am 03e8be75: am 8796ab7f: am bb35356d: Merge changes Id54087dd,I946325e4,I2a2b2e68
* commit '6706888e24aee04c2c914c44e5ef5b1510cf8013':
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