diff options
| author | Hui Lu <huilu@google.com> | 2014-01-31 08:11:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-31 08:11:57 +0000 |
| commit | 945d69d7b843ed319ec98986b033ea7b86383e69 (patch) | |
| tree | 435c0d8150fc08f71ad74bac7098c4d6f4d6f281 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | d0856259762eddd873a068c2e9cd3d4e45009a68 (diff) | |
| parent | 3cab7fc1b8f06166df3a58cf10d4a0db36bde788 (diff) | |
am 3cab7fc1: Merge "Add proxy as another network." into klp-modular-dev
* commit '3cab7fc1b8f06166df3a58cf10d4a0db36bde788':
Add proxy as another network.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions