diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2017-03-28 12:22:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-03-28 12:22:43 +0000 |
| commit | 22b829c049042cf2fbad0935d6bde322a0229236 (patch) | |
| tree | bb616b8b5b9e1e5779bfbe8f5fbd2a5c4f401e76 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 37778743200c3c023c0a4bf69105f4bc213d42fa (diff) | |
| parent | 42cdf577037770a66d27f831d0f9e26532c3628d (diff) | |
Merge changes If94102c7,I8d51e8e0
* changes:
Make ConnectivityServiceTest pass on wifi-only devices.
Restore the net.dnsX system properties.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions