diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-02-23 22:56:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-23 22:56:21 +0000 |
| commit | 5ff0e890d4c1d503b895b840bb66e93312a06e62 (patch) | |
| tree | 81280ab8b4afad88aa988b56d6cbf27584dcb738 /services/java/com/android/server/SystemServer.java | |
| parent | 5b21c57c2a056c0e4ab82599c19ff7eb8836ecb9 (diff) | |
| parent | ec81e831f64bbbd3d9d5c6e84d61a0d9d9512a85 (diff) | |
Merge "Revert "Revert "Delete VPN methods in ConnectivityManager.""" am: 9203e5b94a am: 2d6f195fac am: ec81e831f6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597635
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iff8ce4686f52a73c4a5a2d66218c9a6e3e883a3b
Diffstat (limited to 'services/java/com/android/server/SystemServer.java')
0 files changed, 0 insertions, 0 deletions