| commit | 6ace66ed215e99b16ef84bf902a148e71798024e | [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 | 035c57cbb906bd3352cd5adb3ced859037948c3c | |
| parent | ec138734a7782729e327e9ecf4eb79bce2589a82 [diff] | |
| parent | 96d66bb7b84286818c8e8b6a6c6e4701195b0cd8 [diff] |
Merge "Add a VpnManager.TYPE_VPN_OEM." am: 96d66bb7b8 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644265 Change-Id: Ie010e23484d9ec7ad31631d72292cc52c96f2c10