OSDN Git Service

Merge \"Disallow shell to mutate always-on vpn when DISALLOW_CONFIG_VPN user restrict...
authorVictor Chang <vichang@google.com>
Thu, 14 Jul 2016 22:09:59 +0000 (22:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 14 Jul 2016 22:09:59 +0000 (22:09 +0000)
commitc4ef7669a12950d8a9387d62e29f840447d80e72
treeaa345ce9952810b191a0a1ab4d50454088af1f7d
parent87df5f6ded502f088cd530d90c08f238fbb375a0
parent488042fe3b5b106f41d4a749212458fa2801cbd3
Merge \"Disallow shell to mutate always-on vpn when DISALLOW_CONFIG_VPN user restriction is set\" into nyc-dev
am: 488042fe3b

Change-Id: I4d542c19e057b044544a2ed4f07b9c2cc5866f0f