diff options
| author | Robin Lee <rgl@google.com> | 2016-05-17 09:17:19 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-05-17 09:17:21 +0000 |
| commit | bc73347152a3562a7f957a07433d64912f4acd83 (patch) | |
| tree | d36219453123ec62c0381686a8fa21d0637870e7 /rs/java/android/renderscript/Script.java | |
| parent | bee26480277234cb599a7131cd24ce3c5108e474 (diff) | |
| parent | fe47b6eefa266e2a43294f6472e58698be711ee2 (diff) | |
Merge "Skip 'network may be monitored' if dying or locked" into nyc-dev
Diffstat (limited to 'rs/java/android/renderscript/Script.java')
0 files changed, 0 insertions, 0 deletions