commit | 54c410d7f69c21e88b5c47822ba82e8063978d21 | [log] [tgz] |
---|---|---|
author | Maciej Żenczykowski <maze@google.com> | Tue Oct 24 06:45:26 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Oct 24 06:45:26 2023 +0000 |
tree | c13472d6baa12a26b2427a040b642a7524fa6aa2 | |
parent | fbf0a0967dc3f9cecf342bdc71d53839886ca7a7 [diff] | |
parent | 84c05e0b9620a059cbb5af3bd4f1fb7c9fc71a72 [diff] |
Merge "Revert "ANDROID: extensions/libxt_LOG.c: manually define prioritynames[]"" into main am: 2f7a7bc287 am: b37a9e65d0 am: 84c05e0b96 Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/2800994 Change-Id: I171562e08fd14edb3dc65e9ffcf2ccc696b17954 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>