commit | 404881ae6102cab2f1306f4c50a66fe87c45fae5 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Mar 09 15:01:42 2018 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Mar 09 15:01:42 2018 +0000 |
tree | 1aefa27e792b65b8584c573f2c2710afe87af4e1 | |
parent | 267a5dbd97511fd695e25e8f09f90660ced3ef2e [diff] | |
parent | 4b71619f50294e2a9d06b3e0c130c88a07516dda [diff] |
Merge changes from topic "am-af991497-a243-423d-8f58-f6bc1131a734" into cw-f-dev * changes: [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