| commit | 7853e402050ba4e58d44a7e633f76b52ac4fd50f | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Thu Mar 18 14:28:32 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 18 14:28:32 2021 +0000 |
| tree | 035c57cbb906bd3352cd5adb3ced859037948c3c | |
| parent | 4c83d1509cb45fbe9369c2f767a207f6d81f0cf5 [diff] | |
| parent | 6ace66ed215e99b16ef84bf902a148e71798024e [diff] |
Merge "Add a VpnManager.TYPE_VPN_OEM." am: 96d66bb7b8 am: 6ace66ed21 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644265 Change-Id: Ic6865adf525d216d38c999a74bb4ffa35641e8a3