OSDN Git Service

Merge "Add permission check to setAllowOnlyVpnForUids" am: 1fb2ed3de3
authorRubin Xu <rubinxu@google.com>
Fri, 25 May 2018 09:56:21 +0000 (02:56 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 25 May 2018 09:56:21 +0000 (02:56 -0700)
am: 1efa51a873

Change-Id: I43efafcb80a85f0cb94037440e66a2568b71af63


Trivial merge