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