diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-03-09 15:01:42 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-03-09 15:01:42 +0000 |
| commit | 7df9c2046691cf46d62b169fc02b8a18150882f4 (patch) | |
| tree | 839b87e7c369e76f1a8e54c3bad073e0da98cc0a /rs/java/android/renderscript/RenderScriptGL.java | |
| parent | 923c8d7e356ca62e9e4a86609a468fee41b79d74 (diff) | |
| parent | d56e2e2cd006db558b1b87b1c061075f353c4021 (diff) | |
Merge changes from topic "am-af991497-a243-423d-8f58-f6bc1131a734" into nyc-mr2-dev
* changes:
[automerger] [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids am: 41d8bf1fed am: 595f82f99e am: 3aaa23e1e2 am: 4b71619f50
[automerger] [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids am: 41d8bf1fed am: 595f82f99e am: 3aaa23e1e2
[automerger] [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids am: 41d8bf1fed am: 595f82f99e
[automerger] [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids am: 41d8bf1fed
[DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids
Diffstat (limited to 'rs/java/android/renderscript/RenderScriptGL.java')
0 files changed, 0 insertions, 0 deletions