tree c2d2363dc865e36fc226f02cc4367549a5074df6
parent 20c88e6e6f0d025a188a021b1a4ebe277b534f55
parent b6cf0d8785ad57c4de97abf68507d456bdc8d0a7
author Maciej Żenczykowski <maze@google.com> 1614929252 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614929252 +0000

Merge "bpf offload - add a new 'tether_xdp_devmap'" am: b908e0c867 am: f5a9d32a73 am: b6cf0d8785

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5b47fb6df05d41232eddcf41989d1b19d05dc1d8