tree 830690a3f0a4de6656c1eec7bc0998f95718f477
parent 8cec61d86f30e3946a59047bf4cb6a2f278a9d12
parent 8269d21dec2ede9273d8f13d6a3f85f76a7177d7
author Lorenzo Colitti <lorenzo@google.com> 1613391942 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1613391942 +0000

Merge "Move the VPN code out of packages/Connectivity." am: 8269d21dec

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1589331

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I44cf61bec31d83217ca836aa387030818cd226cb