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