tree fb6aeeec4f12209cf220311103bb1664bfd6d6bd
parent 4a7bce2237c24e2ea720acaaf10f9f3296bbf1ae
parent 30a04c9f2cd54e350b8d0d4a837eb10a6b8f8387
author Maciej Żenczykowski <maze@google.com> 1698439777 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1698439777 +0000

Merge "Add java class for Ingress discard bpf map key value" into main am: 8bc6ee5b7a am: d186c854da am: 30a04c9f2c

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

Change-Id: Icacd640cb3122a205cac414f0faf025ac782d18d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>