| commit | 6de50c80083009f97bb465c95b6c428a11192e43 | [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 | 1826a67e4ae3688e96e0d24e92d45e0954195d95 | |
| parent | 6b91687abf123a23d943a2ebb0e2e444ac40a3e3 [diff] | |
| parent | 630a52226fe2999a32fd1765b1d9e159f30e6a86 [diff] |
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