tree d8d3796d966c9de5b75cfce741e5d4bb2ae9f724
parent ec8adb3089994df6f061ebf20d3b15c3adf45c59
parent 675f699927b289b4b6b7c97775e0aa3e4d487ab1
author TreeHugger Robot <treehugger-gerrit@google.com> 1625279269 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1625279269 +0000

[automerger skipped] Merge "Add tests for in-kernel VPN/VCN dataplane" into sc-dev am: f3c6c3e5b4 am: 675f699927 -s ours

am skip reason: Merged-In I33f14f2d0f71013a594fd4c8c3914a590d30ea06 with SHA-1 1117e853f9 is already in history

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

Change-Id: Ie892a79f66a48be50e21b5a3b09e143f5c38bb3e