| commit | 9eb2c374a2e2202083f77c334cb04b3510e86a0e | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Thu Mar 18 18:25:54 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 18 18:25:54 2021 +0000 |
| tree | 3dc220c016834fa417ece0042e82b87d523a44a5 | |
| parent | 2369f0dff43db52eec36dfddcdce200eb26b7531 [diff] | |
| parent | 6de50c80083009f97bb465c95b6c428a11192e43 [diff] |
Merge "Add a VpnManager.TYPE_VPN_OEM." am: 9794a9444e am: 630a52226f am: 6de50c8008 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644265 Change-Id: I512785d414fcfd4819cdf26ff3c3403c049db475