tree 284053bd535353039f7eed5b9269962b450de1a8
parent 93bdf2a677f5b4a2cc86ebbd2d6a7ba365e8fdf2
parent edaa584272d90029f7294151e9fe008700fc8701
author Xin Li <delphij@google.com> 1644613002 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1644613002 +0000

[automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891 am: bdbf74db36 -s ours am: edaa584272 -s ours

am skip reason: Merged-In I6916462c36f34332fc14c140be619d946c22d1f5 with SHA-1 bf1fd31ee7 is already in history

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

Change-Id: Iba9b63cb3337275a5c5fcbc6e9942ede31fa208e