tree d8d3796d966c9de5b75cfce741e5d4bb2ae9f724
parent 0a3f1441c7c90f376e278df9d8d92acd2aa66a7e
parent 9efcdc49484a8ce8c1927562aba75e7aa8219280
author TreeHugger Robot <treehugger-gerrit@google.com> 1625279284 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1625279284 +0000

[automerger skipped] Merge "Add tests for in-kernel VPN/VCN dataplane" into sc-dev am: f3c6c3e5b4 -s ours am: 9efcdc4948 -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: Ica0969ad48bc59d9ac87ead357d16badd8631bed