Age | Commit message (Collapse) | Author |
|
sdk-release" into sdk-release
|
|
Change-Id: I456d8e055fa5693d9fd97d75292b018ed2b4bf92
|
|
|
|
The .bp file explicitly points to upstream's COPYING file.
Test: treehugger
Change-Id: I07032ea512f785aeddf1a19f83077c64f8cfb751
|
|
sdk-release" into sdk-release
|
|
Change-Id: Id696e4d4d1efe2081c2f73d4df6a779116395abc
|
|
sdk-release" into sdk-release
|
|
Change-Id: I35877743639b9115fc81292f6d4ef805ecff595e
|
|
prioritynames[]"" into main am: 2f7a7bc287 am: b37a9e65d0 am: 24e5ad9a4b
Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/2800994
Change-Id: If91beee1fc15257cf89032848b7f19c5128346be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
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>
|
|
am: 3dd590f333 am: 20799e993e am: f0d39fc4e7
Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/2798950
Change-Id: I0b54f70b416904ecf6bf281e9089dba12859e44a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
0d290e451f am: 9d60c2999e am: 79a37135cc am: dda1fee032 am: 8902cb0d42
Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/2661151
Change-Id: I3dc0983a277e061b254e736a54cdeb12e336c49b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
4c2e8e9be2 am: 6005106fd2 -s ours am: a89c3229ae -s ours am: 06cfeee6a5 -s ours
am skip reason: Merged-In Ia894b5c70dd846d1a34a7e9ada4dc1442d5f53fb with SHA-1 4c2e8e9be2 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/iptables/+/23716874
Change-Id: Id05e679ca2226ba85568aa80300eac6b4b57f9ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
4c2e8e9be2 -s ours am: 26ef810e6a -s ours am: fcc4872b6e -s ours am: dcdd8aef87 -s ours
am skip reason: Merged-In Ia894b5c70dd846d1a34a7e9ada4dc1442d5f53fb with SHA-1 14c4d09445 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/iptables/+/23716874
Change-Id: I2cb6bb121566d088ba06512e3d74b5652260de55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
am: b4fd4142a0 am: 79c7596422 am: cd890a3405 am: 42cdc39beb am: 13567c65bd am: 700b1ce4f3
Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/2622505
Change-Id: I4aa07e9e914380384bda9f6439c22d9a23c8ffde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
prioritynames[]"" into main am: 2f7a7bc287 am: b37a9e65d0
Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/2800994
Change-Id: Ie77542db4835e8d7ef4fb5af7bcbdcdc37d16ac1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
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>
|
|
am: 3dd590f333 am: 20799e993e
Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/2798950
Change-Id: Ic29afbc34238818481d65988afe57fe7770a025d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
0d290e451f am: 9d60c2999e am: 79a37135cc am: dda1fee032
Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/2661151
Change-Id: I17ce26d2393b5823a13ceb786a8ce8a859d40d35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
4c2e8e9be2 am: 6005106fd2 -s ours am: a89c3229ae -s ours
am skip reason: Merged-In Ia894b5c70dd846d1a34a7e9ada4dc1442d5f53fb with SHA-1 4c2e8e9be2 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/iptables/+/23716874
Change-Id: Ie85065b680c5518bca1e8582baaada5efab01e7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
4c2e8e9be2 -s ours am: 26ef810e6a -s ours am: fcc4872b6e -s ours
am skip reason: Merged-In Ia894b5c70dd846d1a34a7e9ada4dc1442d5f53fb with SHA-1 14c4d09445 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/iptables/+/23716874
Change-Id: I99c25faab67910bfff6ff4fee479e5ac3e8f06e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
am: b4fd4142a0 am: 79c7596422 am: cd890a3405 am: 42cdc39beb am: 13567c65bd
Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/2622505
Change-Id: I674d6c7e154b2e286fc67b9ecbc44d4353d855d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
sdk-release" into sdk-release
|
|
Change-Id: I1f9ad355e5c1ba84a9a1cb60f0407b0cd6420c2d
|
|
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>
|
|
prioritynames[]"" into main am: 2f7a7bc287 am: 88a3f66954
Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/2800994
Change-Id: I274ed447208d5ce363016d34fb59ca461dfe5336
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
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>
|
|
prioritynames[]"" into main am: 2f7a7bc287 am: b37a9e65d0
Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/2800994
Change-Id: I26d6f833a8537945c1eea1c724ad18b0b8cd2d20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
prioritynames[]"" into main am: 2f7a7bc287
Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/2800994
Change-Id: I2cd45d9d4c0377e7ebe3f005bf20f7a5582e7cc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
prioritynames[]"" into main am: 2f7a7bc287
Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/2800994
Change-Id: I86a75bc38a84058cd75222d0219e51477b35f127
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
prioritynames[]"" into main am: 2f7a7bc287 am: 991ebe5b86
Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/2800994
Change-Id: Icb2ccde8107033c929f6a69ab9bfd5e10dcc2cc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
prioritynames[]"" into main am: 2f7a7bc287
Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/2800994
Change-Id: I0827f2a6d8be7416b161c625355dc2a7913b3dd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
prioritynames[]"" into main
|
|
9f9015d4a8 am: bb8c39115f
Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/2799843
Change-Id: I2355031cfe38ed5627a35c85b98470955e0acd16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
3b22e80414
Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/2799843
Change-Id: I7ece9d83129d70c5c983fa0cddaf90f60bd620b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
9f9015d4a8
Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/2799843
Change-Id: I5f36194ce8960f77ece18188b686e804f20de939
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
0a8ee35316
Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/2799843
Change-Id: Ie5f08d0d867325ca9a7654fa48359c6b62228e30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/2799843
Change-Id: I5c40248de1cab360c3b3e69b7f726ea6e4352f08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/2799843
Change-Id: I905c3a19a52fc4d56b5b74a188895de1773d8cc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/2799843
Change-Id: I613e1b0798ffcce14c4476d6b5f5914f7e022a70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
This reverts commit 97823ea15ca277ec723a02bc9d4081be5dc3037c.
Reason for revert: no longer needed after bionic header update
Change-Id: If9641bbc2462a43e91f26d59957d66e55dea42c9
|
|
* changes:
Merge branch 'master' of https://git.netfilter.org/iptables
bump to 1.8.10
Merge tag 'v1.8.10' of https://git.netfilter.org/iptables
ANDROID: unconditionally use 'all' for proto 0
ANDROID: extensions/libxt_LOG.c: manually define prioritynames[]
include: Add missing linux/netfilter/xt_LOG.h
bump to 1.8.9
Merge upstream at one commit past 1.8.9 at ed4082a7405a5838c205a34c1559e289949200cc
Merge tag 'v1.8.9' of https://git.netfilter.org/iptables
|
|
am: 3dd590f333 am: f31a447893 am: 0d05fdf1b9
Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/2798950
Change-Id: I4612137d5691eebafd9ad6ebab91941fb11f1dee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
am: 3dd590f333 am: 20799e993e am: 4463bce0c7
Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/2798950
Change-Id: I95355669bcae23f90df28cf9ffc0d8fd9ba5d92e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
am: 3dd590f333 am: f31a447893
Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/2798950
Change-Id: I6a809794febb074fa8aa86cb05347fa9f2523abe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
am: 3dd590f333 am: 20799e993e
Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/2798950
Change-Id: Ib60a0cf211acedce80c944f77f4a76a3c22bd7ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
am: 3dd590f333
Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/2798950
Change-Id: Icc7699c21ba99281549edfde6b2273dc8233f500
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
am: 3dd590f333
Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/2798950
Change-Id: I96a546e9e0a5ea63da7bc0e5cd991f3bd9b60997
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
am: 3dd590f333 am: 367ce4e075
Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/2798950
Change-Id: I99939036c33aa85a754fe114da0ae1b9b57f6753
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
am: 3dd590f333
Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/2798950
Change-Id: I9a2d6c7fb1cb57743fb349953bf7d84d4a0ac149
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|