| commit | 630a52226fe2999a32fd1765b1d9e159f30e6a86 | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Thu Mar 18 13:50:18 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 18 13:50:18 2021 +0000 |
| tree | 2ed09ca564a629f275c61550e56add68ce7700a3 | |
| parent | 5cb76b50f39287bcedb04dc698c343c1f785a193 [diff] | |
| parent | 9794a9444e83c4a223e2ee2d62fbd4fed95b1851 [diff] |
Merge "Add a VpnManager.TYPE_VPN_OEM." am: 9794a9444e Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644265 Change-Id: Ie010e23484d9ec7ad31631d72292cc52c96f2c10