From: Rubin Xu <rubinxu@google.com>
Date: Fri, 25 May 2018 09:56:21 +0000 (-0700)
Subject: Merge "Add permission check to setAllowOnlyVpnForUids" am: 1fb2ed3de3
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d71467740b;p=android-x86%2Fframeworks-base.git

Merge "Add permission check to setAllowOnlyVpnForUids" am: 1fb2ed3de3
am: 1efa51a873

Change-Id: I43efafcb80a85f0cb94037440e66a2568b71af63
---

d71467740bd7c323989a65957a5d7bc9c5d3d0c1