| commit | cb251114d3af332612110cfd726c883938398a8a | [log] [tgz] |
|---|---|---|
| author | Nataniel Borges <natanieljr@google.com> | Fri Feb 19 17:02:32 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Feb 19 17:02:32 2021 +0000 |
| tree | 326944bd2497aa009a70c3171285c6b9ee6b4a12 | |
| parent | 4786dccb26d87dac87539399c8fdecd3fd8e0f92 [diff] | |
| parent | ea2109dfb4539ca8b54779bf4f6204d1793d25b9 [diff] |
Merge "Revert "Delete VPN methods in ConnectivityManager."" am: 19261dd671 am: e14f718270 am: ea2109dfb4 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596592 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9d80ea1c572a3eec58a67b0d7c4faa79b30c206a