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 | fb6e4bc01b3af924fbca3c566bfac90a92a906b5 (patch) | |
| tree | 89c30bffe4384c2d4a6a9a73fa2aa0bbee091027 /rs/java/android/renderscript/ProgramStore.java | |
| parent | 71478241eb069f13cb1d1e9550d7bb35f8a8a121 (diff) | |
| parent | 595f82f99ee2dc2b03e8c503ee11ffddc641121c (diff) | |
Merge changes from topic "am-af991497-a243-423d-8f58-f6bc1131a734" into nyc-dr1-dev
* changes:
[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/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions