| commit | 8d481dda222418b5eb4ee2521be00377596210bf | [log] [tgz] |
|---|---|---|
| author | Maciej Żenczykowski <maze@google.com> | Tue Oct 24 06:43:37 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Oct 24 06:43:37 2023 +0000 |
| tree | c13472d6baa12a26b2427a040b642a7524fa6aa2 | |
| parent | 858bb5e6c37693f7578d3f0fb4ee60c7418f6a4c [diff] | |
| parent | 035796aa0568b672c5954cc7c0002db2e753a19b [diff] |
Merge "Revert "ANDROID: extensions/libxt_LOG.c: manually define prioritynames[]"" into main am: 2f7a7bc287 am: 991ebe5b86 am: 035796aa05 Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/2800994 Change-Id: I2526e2889d5d0b01240ef0115b929e0427ac918d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>