Lorenzo Colitti cca30a72ac Merge "Add a VpnManager.TYPE_VPN_OEM." am: 96d66bb7b8 am: 6ace66ed21 am: 7853e40205 ...

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

Change-Id: I512785d414fcfd4819cdf26ff3c3403c049db475

2021-03-18 18:25:54 +00:00

..

android

Merge "Add a VpnManager.TYPE_VPN_OEM." am: 96d66bb7b8 am: 6ace66ed21 am: 7853e40205

2021-03-18 18:25:54 +00:00

com/android

Merge "Address remaining comments on aosp/1607893" am: 08b0411d4f am: ec138734a7 am: 4c83d1509c

2021-03-18 18:25:31 +00:00