tree 4b21dd9e772d5d47832a819578725b8eecacc5c1
parent 6683cc6a83a86c14a2b47ae7519a60a02ee3bc3c
parent 91f16ace4f3121a34b038dd453386b9d4daf826a
author Benjamin Miller <benjaminmiller@google.com> 1501263018 +0000
committer android-build-merger <android-build-merger@google.com> 1501263018 +0000

Merge "Docs: Note that DISALLOW_CONFIG_VPN stops VPNs from starting" into oc-dev
am: 91f16ace4f

Change-Id: Id7d2c62577e0b534a7dd6605f722e7c5639e46b7