diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-04-17 05:11:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-04-17 05:11:21 +0000 |
| commit | 7eb8260236a4884804960ae2b5c153a471d16db6 (patch) | |
| tree | 18c666a395564313a10a98f2efd3da5f395e8780 /rs/java/android/renderscript/RenderScriptCacheDir.java | |
| parent | 487737b876b5a2d2ffc2f3a875243efdbe0fb48b (diff) | |
| parent | 4dd58ed08a11dd1c8032092a150b81de27ef130e (diff) | |
Merge changes I76ae853c,If94102c7 into oc-dev
* changes:
Ignore potential SystemProperties errors when setting net.dns
Make ConnectivityServiceTest pass on wifi-only devices.
Diffstat (limited to 'rs/java/android/renderscript/RenderScriptCacheDir.java')
0 files changed, 0 insertions, 0 deletions