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