diff options
| author | Alex Klyubin <klyubin@google.com> | 2013-10-29 08:50:28 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-29 08:50:28 -0700 |
| commit | 569220399841ae1a3fd62a1b77fa087bca2ee0f3 (patch) | |
| tree | da24702917a2e8714712928a272ee6d3bafef058 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ddc91628819f02d6cfb60cfa26b582d52fa76cde (diff) | |
| parent | b4cae4a955ebd91cf35aaeb00ab12ce6f1d5fc48 (diff) | |
am b4cae4a9: Merge "Fix SSLCertificateSocketFactory.getDefaultCipherSuites."
* commit 'b4cae4a955ebd91cf35aaeb00ab12ce6f1d5fc48':
Fix SSLCertificateSocketFactory.getDefaultCipherSuites.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions