diff options
| author | Kenny Root <kroot@google.com> | 2013-06-27 14:57:46 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-27 14:57:46 -0700 |
| commit | b3933b979ddff8ff90ee7ac9ab2bbf33df1e1ec9 (patch) | |
| tree | 5667a10e3f78e59b4245825ed33ab8084c4f8a94 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | a2c8cbdd9598bae58a54aaea097705b2aa1779b8 (diff) | |
| parent | 67f7d8fbd5ad84681fbdfea184ce538c6834896a (diff) | |
am 67f7d8fb: am 6c042b6d: am a5a2de55: Merge "Add ALPN support to SSL socket factory"
* commit '67f7d8fbd5ad84681fbdfea184ce538c6834896a':
Add ALPN support to SSL socket factory
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions