tree cae97e5854dbaa5523c8b8b86ecf3a41c4f32f8a
parent b9c6d49a6f7271fc1f123c3cb09e74ac3d1ed5ce
parent e06458378dc20dfd21f06a86a68bf3bdc15cbfb5
author Mark Chien <markchien@google.com> 1646667867 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1646667867 +0000

Merge "Remove dead code in BpfNetMaps." am: e06458378d

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

Change-Id: I1d44c652972e43f6598fcb231bdc538e3836a046