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