tree 9b04b0c224bcb5b7b200b33455687b8154a9aa25
parent b30ba815edc05473adac33c775e02ba36a302717
parent 4da7a57067a7335d4b51fc8e9418d3d373edbaf6
author Chiachang Wang <chiachangwang@google.com> 1709210189 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1709210189 +0000

Merge "Add FrameworksVpnTests" into main am: 344143b49c am: 4da7a57067

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

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