tree 2001f636224b0ab868ca5124dedb4ac876c76159
parent 435f5433f75ffb712631648834777de5040ef0df
parent d36de126524f5ca2287d65163cef5f4a23f4d183
author Treehugger Robot <treehugger-gerrit@google.com> 1643720925 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1643720925 +0000

Merge "Clean up BpfNetMaps" am: d36de12652

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

Change-Id: Id1dec2119e9c3c4cf4cd4ed88009244ee3a0ba32