tree 1826a67e4ae3688e96e0d24e92d45e0954195d95
parent 6b91687abf123a23d943a2ebb0e2e444ac40a3e3
parent 630a52226fe2999a32fd1765b1d9e159f30e6a86
author Lorenzo Colitti <lorenzo@google.com> 1616077712 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1616077712 +0000

Merge "Add a VpnManager.TYPE_VPN_OEM." am: 9794a9444e am: 630a52226f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644265

Change-Id: Ic6865adf525d216d38c999a74bb4ffa35641e8a3