tree 5069e1b9e9571233ec665cc09a5ec7409bb8100a
parent bc53086a1fddc8c495c9858d2c605f5db6fe37a5
parent 5934ae605a0d84f8a21c4637f60b07b884837dfd
author Benjamin Miller <benjaminmiller@google.com> 1501276541 +0000
committer android-build-merger <android-build-merger@google.com> 1501276541 +0000

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

Change-Id: Ia4c07afe64fd3a0a743790f1e1284bdc1db0f4c5