diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2015-02-11 07:33:10 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-11 07:33:10 +0000 |
| commit | e1507ac506a4dac327a5cbabede0384836659de0 (patch) | |
| tree | 958470288f0b922f9d1f414a52684b65a66d83c8 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c54a87e302a2a28b16864f71b9db57241d68ca48 (diff) | |
| parent | 00c8450d2711de57ee45f66cae1050dbca98d1f5 (diff) | |
am 00c8450d: Merge "Make getNetworkInfo() take into account VPN underlying networks." into lmp-mr1-dev automerge: c38b90b
* commit '00c8450d2711de57ee45f66cae1050dbca98d1f5':
Make getNetworkInfo() take into account VPN underlying networks.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions