| commit | 4cd9ca834ba49ebd1d46a5786e0b6d9dca3e633a | [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 | b3a9f8b6cef421f7eaa7100b2791525befe2e192 | |
| parent | aee047252260036a0184bad33d426f6d248418f3 [diff] | |
| parent | 46f3a23d2863cdbbac9144b1de53a733c5d114ad [diff] |
Merge "Revert "Delete VPN methods in ConnectivityManager."" am: fc15416480 am: 46f3a23d28 am: aa2b03ecea Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596592 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9d80ea1c572a3eec58a67b0d7c4faa79b30c206a