diff options
author | Marco Nelissen <marcone@google.com> | 2014-03-14 23:37:52 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-14 23:37:52 +0000 |
commit | 77a00cfe4b29f180b6f5ed65eddc96422453e191 (patch) | |
tree | ec4f37602bb16172246f0daa37cc61c78c5695cb /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | f1b1855acc623f6137f1d51810948a8149b2a9e8 (diff) | |
parent | 30260c7e93fa5d5a08c505e1b804849bb56b83f1 (diff) |
am 30260c7e: am 203a6ddb: am 105c4792: am 10a07a04: Merge "Verify certificates" into klp-dev
* commit '30260c7e93fa5d5a08c505e1b804849bb56b83f1':
Verify certificates
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions