diff options
author | Wink Saville <wink@google.com> | 2013-10-31 14:23:41 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-31 14:23:41 -0700 |
commit | 2321290fb717163b36a49fd04d29abc692a4e7f8 (patch) | |
tree | 839093aa990b108b48062fd3ef3bf47975613dbf /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 8bcee6e67ac71a5d817cf4be92ef88ca9db30e8a (diff) | |
parent | 6952b6fac5930d3278f0103280f1ac9348d27a79 (diff) |
am 6952b6fa: am b4f673e2: Merge "Use HttpsURLConnection to by pass proxies." into klp-dev
* commit '6952b6fac5930d3278f0103280f1ac9348d27a79':
Use HttpsURLConnection to by pass proxies.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions