diff options
| author | Paul Jensen <pauljensen@google.com> | 2014-12-11 04:55:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-11 04:55:52 +0000 |
| commit | d9d48cc9c7ab0d1590918e199917968eafc48288 (patch) | |
| tree | 4c93ce8f1e59ce24437427e02c2fc38f5af69ae3 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | b07de8d172e7c7b663dec0dd14f7d6dba168aa4c (diff) | |
| parent | 2122e14cca3edc5099b90d8768b34d7a0e9fe148 (diff) | |
am 2122e14c: Merge "Fix several HTTP proxy issues with multinetworking." into lmp-mr1-dev
* commit '2122e14cca3edc5099b90d8768b34d7a0e9fe148':
Fix several HTTP proxy issues with multinetworking.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions