OSDN Git Service

Merge "Docs: Note that DISALLOW_CONFIG_VPN stops VPNs from starting" into oc-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Fri, 28 Jul 2017 17:11:28 +0000 (17:11 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 28 Jul 2017 17:11:28 +0000 (17:11 +0000)

Trivial merge