diff options
| author | Kenny Root <kroot@google.com> | 2014-03-25 19:09:27 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-25 19:09:27 +0000 |
| commit | dd3e6399098c46e0d38c810213fd956bed305c62 (patch) | |
| tree | e838a1802f27efc54f3c619e599232d715ab0780 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 12b575bd5a557a485e80df49ef05a402e8c53f6a (diff) | |
| parent | c1d863e7a4b55f8e583067eebaffc6686723d7ab (diff) | |
am c1d863e7: am 77ceb5e8: Merge "Use X509ExtendedTrustManager and not Conscrypt"
* commit 'c1d863e7a4b55f8e583067eebaffc6686723d7ab':
Use X509ExtendedTrustManager and not Conscrypt
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions