diff options
| author | Marco Nelissen <marcone@google.com> | 2014-03-15 00:24:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-15 00:24:40 +0000 |
| commit | bc3e4e7a4a04c19a663263d8303559b11caed3ea (patch) | |
| tree | f5365be90dbcf7ad41c8543a4a7e11a71179985a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | bb54eac7c9a9bcfbf2b7fb4ea13d82292b34b188 (diff) | |
| parent | 77a00cfe4b29f180b6f5ed65eddc96422453e191 (diff) | |
am 77a00cfe: (-s ours) am 30260c7e: am 203a6ddb: am 105c4792: am 10a07a04: Merge "Verify certificates" into klp-dev
* commit '77a00cfe4b29f180b6f5ed65eddc96422453e191':
Verify certificates
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions