| commit | 46f3a23d2863cdbbac9144b1de53a733c5d114ad | [log] [tgz] |
|---|---|---|
| author | Nataniel Borges <natanieljr@google.com> | Fri Feb 19 16:12:03 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Feb 19 16:12:03 2021 +0000 |
| tree | 7d844b4bc7aced8c1637d9a80c7f0ec705419e72 | |
| parent | 3f6ac55db0e10dfd419ce0f10469d872154489f0 [diff] | |
| parent | fc1541648071032c7545be2463fb471d75129004 [diff] |
Merge "Revert "Delete VPN methods in ConnectivityManager."" am: fc15416480 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596592 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3572428c0044d410055a53f4bff680c2dd474028