am 630e9b5e: am a4aab96e: am 5e0ef0d0: Merge "Say in the doc that DISALLOW_CONFIG_VPN now works." into mnc-dev
am 630e9b5e: am a4aab96e: am 5e0ef0d0: Merge "Say in the doc that DISALLOW_CONFIG_VPN now works." into mnc-dev

* commit '630e9b5e7f0a0bafef650452143c85c0815db58c':
  Say in the doc that DISALLOW_CONFIG_VPN now works.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base