tree 1838fe1ce2d11a8ea5501dc8cb176e9a6c3a355a
parent 9cdfb9d781d0af0ee25eea0f7cbfa8581a400cc5
parent e293b0cd0027741222299bbad6ea365982d2b357
author Victor Chang <vichang@google.com> 1468533850 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1468533851 +0000

Merge "Disallow shell to mutate always-on vpn when DISALLOW_CONFIG_VPN user restriction is set" into nyc-dev