OSDN Git Service

Merge "Docs: Note that DISALLOW_CONFIG_VPN stops VPNs from starting" into oc-dev...
authorBenjamin Miller <benjaminmiller@google.com>
Fri, 28 Jul 2017 21:15:41 +0000 (21:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 28 Jul 2017 21:15:41 +0000 (21:15 +0000)
am: 5934ae605a

Change-Id: Ia4c07afe64fd3a0a743790f1e1284bdc1db0f4c5


Trivial merge