tree 90d15ef34b011619da62308bc1a9cab0fcb7f6a9
parent 24e279166fb0d8df86ed77955a7fc621d528d9e5
parent 86d9d00a7c890a1c5b36bd2362b0270df5d73aee
author Lucas Lin <lucaslin@google.com> 1649824597 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1649824597 +0000

Merge changes from topic "vpn-api-fixes" am: 86d9d00a7c

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2031063

Change-Id: Idba08a163cbeef549ff4e925ec2649085bce45af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>