OSDN Git Service

Merge \\"Disallow shell to mutate always-on vpn when DISALLOW_CONFIG_VPN user restric...
authorVictor Chang <vichang@google.com>
Wed, 13 Jul 2016 18:47:10 +0000 (18:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 13 Jul 2016 18:47:10 +0000 (18:47 +0000)
commitec548dbb7587f6edafd8737f9d360ca415484dc4
tree8bcbcfcb89232926eb328190c1b8c94c3ec797a7
parent0812bbcc18dbb0c7d44d2de7f90ea0a1b2277ed6
parent87ec0ef5e2aae7a078c132e70f017ac01e899690
Merge \\"Disallow shell to mutate always-on vpn when DISALLOW_CONFIG_VPN user restriction is set\\" into nyc-mr1-dev am: e05b35db0d
am: 87ec0ef5e2

Change-Id: Ib6ed82c6e9e48cb7f08cfca194331796c5cdd5ba