diff options
| author | Hugo Benichi <hugobenichi@google.com> | 2017-05-26 00:34:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-05-26 00:34:05 +0000 |
| commit | 0388f0e47b9853437cdeebafc77d38e86606554b (patch) | |
| tree | 64977dd5aa82375fa292aab2d92cc377e07f2f66 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 25ce41cf4c54eb2be721c7cdaede5d866181ffa0 (diff) | |
| parent | 03f6e1d18a495fb2fe691db7537e944aba1f13cc (diff) | |
Merge changes If4deb106,Ib25d7658
* changes:
NsdService: do not use ContentResolver directly
@Ignore ConnectivityServiceTest#testRequestBenchmark
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions