tree 6712ce73b32b339d70d2768945862d95b118bf5a
parent 3ddb70c9e799977c9a9f0ee8f3cfbfdd22354812
parent e05b35db0d309b41edfe30e415b5fa746f7964a2
author Victor Chang <vichang@google.com> 1468435249 +0000
committer android-build-merger <android-build-merger@google.com> 1468435249 +0000

Merge \"Disallow shell to mutate always-on vpn when DISALLOW_CONFIG_VPN user restriction is set\" into nyc-mr1-dev
am: e05b35db0d

Change-Id: I0b47bc6184ee3b4b9ac4783decf4c8cd30b70fbd