tree d91f7e603d6112a471af1fa1f5f230e5d93d852a
parent adb8c522a84b5c7531b009b7a8d4c854ca7dee08
parent 05fef7ed69af434dc43c700a751140ecbbfd069d
author TreeHugger Robot <treehugger-gerrit@google.com> 1501261888 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1501261888 +0000

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