tree 3c2052fdc85765032cb541db3fe7515b17d17a53
parent f751c1415ec532439482a960d90736ca45b6411d
parent 74515b357fe25a7d21df7812c939d73cc68b3605
author Maciej Żenczykowski <maze@google.com> 1617401476 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1617401476 +0000

Merge changes from topic "b183485987" am: 90c8570e0b am: 74515b357f

Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/1650938

Change-Id: Ib1ab493361b810c33224ab364a9756397f1210bf