OSDN Git Service

Merge "[DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids" into oc-dev
authorRubin Xu <rubinxu@google.com>
Fri, 9 Mar 2018 15:15:07 +0000 (15:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 9 Mar 2018 15:15:07 +0000 (15:15 +0000)
commit8dddc5e1f87d7416f5a7edc8d8133fb6159dc13a
treee40bf8b3f601895f6e099570c47ae75b0aec65d2
parentbdc573b39bf5c47eb07ca07e3ed6ac78790c4675
parenta9df845321eaab4b1e237eff6e47dbe3d7e41e1e
Merge "[DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids" into oc-dev
am: a9df845321

Change-Id: I0d7f4421d10f977eb9071ba3478da771e58541ca
services/core/java/com/android/server/NetworkManagementService.java