Merge "Add a VpnManager.TYPE_VPN_OEM."
tree: 035c57cbb906bd3352cd5adb3ced859037948c3c
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS