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