diff options
| author | Chad Brubaker <cbrubaker@google.com> | 2015-12-09 23:15:42 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-12-09 23:15:42 +0000 |
| commit | 1edf850235c13581709b106520b3f512dc0dc413 (patch) | |
| tree | 919032c687431792c5b45afc46293e032668a1e8 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 8d92314e5f3e071ab35f1010e06df02f1b8cc63b (diff) | |
| parent | 5a12cf5cb703dd531ca8207e8db87b019eb6d477 (diff) | |
Merge "Use a custom TrustedCertificateStore" am: 95f15495a2
am: 5a12cf5cb7
* commit '5a12cf5cb703dd531ca8207e8db87b019eb6d477':
Use a custom TrustedCertificateStore
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions