| commit | 467dd03df16db9f469caa9f0f8f37b37497d8345 | [log] [tgz] |
|---|---|---|
| author | Maciej Żenczykowski <maze@google.com> | Fri Dec 08 20:28:31 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Dec 08 20:28:31 2023 +0000 |
| tree | c13472d6baa12a26b2427a040b642a7524fa6aa2 | |
| parent | d0a51143690bc36905c06d2a4b0cbf0cc793c0ad [diff] | |
| parent | 05c685e485c302f051879e0cffdd9af45b0c1416 [diff] |
Merge changes from topics "ipt1810", "ipt189" into main am: 8e74bb6bb5 am: 0a8ee35316 am: 05c685e485 Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/2799843 Change-Id: I1a0d91477295f825e9af0f5d6297b4e7b62df99b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>