tree 420e525ca884dc191613d7ebab9741c01f6c2b78
parent f2d710cfd1223068ef1b5d4274bc2710305f2318
parent ef8130717846e63618ba058b0ad0afe27c1cc631
author Treehugger Robot <treehugger-gerrit@google.com> 1612876323 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1612876323 +0000

Merge "Switch Settings from IConnectivityManager to VpnManager." am: ace5a90870 am: 29302ad638 am: ef81307178

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1574947

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1e15b275b641c614e5f55d27204fd72f90f723b8