diff options
author | Chong Zhang <chz@google.com> | 2014-03-25 00:32:17 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-25 00:32:17 +0000 |
commit | 29e4cf0a1a0ece43d524b4dfa340ab98da6e19f5 (patch) | |
tree | 924d1b7f5991da5f1da7a5f1344f0090e12fdb8e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | c9b0d582071c7b4fb2538b86e2e0c4c2f914b664 (diff) | |
parent | 2ac81ee6ba51708d5504db5762ef44aafefc6ee2 (diff) |
am 2ac81ee6: (-s ours) am c4e6233b: am b68d38e8: DO NOT MERGE change Surface constructor arg to 64bit
* commit '2ac81ee6ba51708d5504db5762ef44aafefc6ee2':
DO NOT MERGE change Surface constructor arg to 64bit
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions