aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-05-10Snap for 8564071 from d5cc7e9c6a5e7781d16a1b8eb0d7c63cd8839d00 to ↵aml_sta_341114000aml_sta_341111000aml_sta_341010020aml_sta_340912000aml_sta_340911000aml_sta_331910000aml_sta_331811000aml_sta_331711010aml_sta_331610000aml_sta_331511000aml_sta_331410000aml_sta_331311000aml_sta_331010010aml_sta_330910000aml_net_341111030android13-mainline-os-statsd-releaseAndroid Build Coastguard Worker
mainline-os-statsd-release Change-Id: If54444771c5bc46b0379fac62389fb59c84f0fe3
2022-02-11[automerger skipped] Empty merge of ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_con_330443020t_frc_cbr_330443000t_frc_ase_330444010t_frc_art_330443060android-wear-13.0.0-gpl_r3android-wear-13.0.0-gpl_r2android-wear-13.0.0-gpl_r1android-u-beta-3-gplandroid-u-beta-2-gplandroid-u-beta-1-gplandroid-t-qpr3-beta-3-gplandroid-t-qpr3-beta-1-gplandroid-t-qpr2-beta-3-gplandroid-t-qpr2-beta-2-gplandroid-t-qpr1-beta-3-gplandroid-t-qpr1-beta-2-gplandroid-t-qpr1-beta-1-gplandroid-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r55android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android-13.0.0_r30android-13.0.0_r29android-13.0.0_r28android-13.0.0_r27android-13.0.0_r24android-13.0.0_r23android-13.0.0_r22android-13.0.0_r21android-13.0.0_r20android-13.0.0_r19android-13.0.0_r18android-13.0.0_r17android-13.0.0_r16aml_uwb_341111010aml_uwb_341011000aml_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_hef_341114030aml_go_wif_330911000aml_go_uwb_330912000aml_go_tz4_330912000aml_go_tet_330914010aml_go_swc_330913000aml_go_sta_330911000aml_go_sdk_330810000aml_go_sch_330911000aml_go_res_330912000aml_go_per_330912000aml_go_odp_330913000aml_go_odp_330912000aml_go_neu_330912000aml_go_net_330913000aml_go_mpr_330912000aml_go_ase_330913000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000aml_go_adb_330913000aml_ase_341113000aml_ase_340913000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_ads_341131050aml_ads_341027030aml_ads_340915050aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000main-16k-with-phonesmain-16kandroid14-devandroid13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-qpr1-s8-releaseandroid13-qpr1-s7-releaseandroid13-qpr1-s6-releaseandroid13-qpr1-s5-releaseandroid13-qpr1-s4-releaseandroid13-qpr1-s3-releaseandroid13-qpr1-s2-releaseandroid13-qpr1-s1-releaseandroid13-qpr1-releaseandroid13-mainline-uwb-releaseandroid13-mainline-tzdata4-releaseandroid13-mainline-go-wifi-releaseandroid13-mainline-go-uwb-releaseandroid13-mainline-go-tzdata4-releaseandroid13-mainline-go-tethering-releaseandroid13-mainline-go-sdkext-releaseandroid13-mainline-go-scheduling-releaseandroid13-mainline-go-resolv-releaseandroid13-mainline-go-permission-releaseandroid13-mainline-go-os-statsd-releaseandroid13-mainline-go-odp-releaseandroid13-mainline-go-neuralnetworks-releaseandroid13-mainline-go-networking-releaseandroid13-mainline-go-mediaprovider-releaseandroid13-mainline-go-media-swcodec-releaseandroid13-mainline-go-appsearch-releaseandroid13-mainline-go-adservices-releaseandroid13-mainline-go-adbd-releaseandroid13-mainline-appsearch-releaseandroid13-mainline-adservices-releaseandroid13-frc-odp-releaseandroid13-frc-conscrypt-releaseandroid13-frc-cellbroadcast-releaseandroid13-frc-art-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-releaseandroid-wear-13.0.0-gpl_r1aml_tz4_332714010Xin Li
sc-v2-dev-plus-aosp-without-vendor@8084891 am: bdbf74db36 -s ours am: edaa584272 -s ours am skip reason: Merged-In I6916462c36f34332fc14c140be619d946c22d1f5 with SHA-1 bf1fd31ee7 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/iptables/+/16843516 Change-Id: Iba9b63cb3337275a5c5fcbc6e9942ede31fa208e
2022-02-11[automerger skipped] Empty merge of ↵Xin Li
sc-v2-dev-plus-aosp-without-vendor@8084891 am: bdbf74db36 -s ours am skip reason: Merged-In I6916462c36f34332fc14c140be619d946c22d1f5 with SHA-1 bf1fd31ee7 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/iptables/+/16843516 Change-Id: I856864aa4773b30f124e33ec27f54e2ee5538355
2022-02-11Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891Xin Li
Bug: 214455710 Merged-In: I6916462c36f34332fc14c140be619d946c22d1f5 Change-Id: I9243165b769009363e1510ed2ca492ebdc1af5b3
2022-02-09Merge "iptables: switch OWNERS to core networking" am: fb997f4857 am: ↵Treehugger Robot
f790af262e am: ed742166ba am: 83e24b105b Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/1976931 Change-Id: I5ca2e5dbb8f7ea0d7d7c5aad25708af886ffb3c9
2022-02-09Merge "iptables: switch OWNERS to core networking" am: fb997f4857 am: ↵Treehugger Robot
f790af262e am: ed742166ba Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/1976931 Change-Id: I970f036ef1249b7d63286133e1ed41943f184c01
2022-02-09Merge "iptables: switch OWNERS to core networking" am: fb997f4857 am: f790af262eTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/1976931 Change-Id: I2d307a3f5e0c90da2e0c2773a9356f3542a7e781
2022-02-09Merge "iptables: switch OWNERS to core networking" am: fb997f4857Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/1976931 Change-Id: Ibc43ce3160e3065ee54a08af07a30117c3177b8f
2022-02-09Merge "iptables: switch OWNERS to core networking"android-t-preview-1android-s-v2-beta-3android-t-preview-1android-s-v2-beta-3Treehugger Robot
2022-02-08iptables: switch OWNERS to core networkingMaciej Żenczykowski
(effectively a no-op, just more directly accomplishes the same thing) Test: N/A, TreeHugger Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I52edcae3bf6f35047d5fdec9dfe9c56c7c9e6f33
2022-01-25Merge "Remove libnetdbpf_test from TEST_MAPPING" am: 3513ade8c0 am: ↵Maciej Żenczykowski
706c15f6b1 am: bb5e8f4645 am: 7c3861b7e0 Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/1956012 Change-Id: I69d2d2a7241623c36897cd5801dd6376522e6477
2022-01-25Merge "Remove libnetdbpf_test from TEST_MAPPING" am: 3513ade8c0 am: ↵Maciej Żenczykowski
706c15f6b1 am: bb5e8f4645 Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/1956012 Change-Id: Ica677ef9ff072edccb0ee71ca4ff9942141a6b05
2022-01-25Merge "Remove libnetdbpf_test from TEST_MAPPING" am: 3513ade8c0 am: 706c15f6b1Maciej Żenczykowski
Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/1956012 Change-Id: I7980462258a98850437c54e797367f4bba7a6a5a
2022-01-25Merge "Remove libnetdbpf_test from TEST_MAPPING" am: 3513ade8c0Maciej Żenczykowski
Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/1956012 Change-Id: I4b5fb3006dd6c4931ed6ca4bc6bd47e7619da01c
2022-01-25Merge "Remove libnetdbpf_test from TEST_MAPPING"Maciej Żenczykowski
2022-01-23Remove libnetdbpf_test from TEST_MAPPINGKen Chen
libnetdbpf_test has nothing to do with iptables Bug: 202086915 Test: m Change-Id: Ie40b0b12eaedec662d5aafe617f241687abd24a9
2021-07-15Snap for 7550844 from fae46950c0c0818cac1b37a7042b86fb03a75511 to ↵android-mainline-12.0.0_r84android-mainline-12.0.0_r58android12-mainline-statsd-releaseAndroid Build Coastguard Worker
mainline-os-statsd-release Change-Id: I90ec4f159f2002b3c59f3c7e5c1f78eaa9c39218
2021-06-03[automerger skipped] Enable Async MTE in iptables. am: bf1fd31ee7 am: ↵Evgenii Stepanov
fae46950c0 -s ours am skip reason: Merged-In I6916462c36f34332fc14c140be619d946c22d1f5 with SHA-1 bf1fd31ee7 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/iptables/+/14793517 Change-Id: I6e301284f80e4ab9a94b5fbb57bad7ead78d1552
2021-06-02[automerger skipped] Enable Async MTE in iptables. am: bf1fd31ee7 -s ours ↵Evgenii Stepanov
am: 0606373b05 -s ours am: 2276b2276c -s ours am skip reason: Merged-In I6916462c36f34332fc14c140be619d946c22d1f5 with SHA-1 bf1fd31ee7 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/iptables/+/14793517 Change-Id: I2ecaad224cc1c28f478932d649f4e4792a7e41b9
2021-06-02[automerger skipped] Enable Async MTE in iptables. am: bf1fd31ee7 -s ours ↵Evgenii Stepanov
am: 0606373b05 -s ours am skip reason: Merged-In I6916462c36f34332fc14c140be619d946c22d1f5 with SHA-1 bf1fd31ee7 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/iptables/+/14793517 Change-Id: I4f9403ff80a781d8ad982bc7b6fba6c231310ed0
2021-06-02[automerger skipped] Enable Async MTE in iptables. am: bf1fd31ee7 am: ↵Evgenii Stepanov
8a43caac6c -s ours am: a591491b13 -s ours am skip reason: Merged-In I6916462c36f34332fc14c140be619d946c22d1f5 with SHA-1 bfcaf7b8d7 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/iptables/+/14793517 Change-Id: I62586c7f3d3f9091831ecc845f8d9ab3cfe26202
2021-06-02[automerger skipped] Enable Async MTE in iptables. am: bf1fd31ee7 am: ↵Evgenii Stepanov
8a43caac6c -s ours am skip reason: Merged-In I6916462c36f34332fc14c140be619d946c22d1f5 with SHA-1 bfcaf7b8d7 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/iptables/+/14793517 Change-Id: I58af0afeaaf9c6681c469c2b026e1bb4aa02304e
2021-06-02Enable Async MTE in iptables. am: bf1fd31ee7android-s-qpr3-beta-1android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid-s-qpr3-beta-1Evgenii Stepanov
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/iptables/+/14793517 Change-Id: I79a44ae1f078c7ebb1a3bd14c1ba07794996218b
2021-06-02[automerger skipped] Enable Async MTE in iptables. am: bf1fd31ee7 -s oursandroid-s-v2-preview-1android-s-v2-preview-1Evgenii Stepanov
am skip reason: Merged-In I6916462c36f34332fc14c140be619d946c22d1f5 with SHA-1 bfcaf7b8d7 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/iptables/+/14793517 Change-Id: Iba001de4adee3545d9dc79c7fa4d3ae9eea0becf
2021-06-02Enable Async MTE in iptables. am: bf1fd31ee7android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-releaseEvgenii Stepanov
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/iptables/+/14793517 Change-Id: I33cea2b042270feb439fa016e5ac5865557e77ea
2021-06-01Enable Async MTE in iptables.android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devEvgenii Stepanov
This change enables Async mode ARM MTE in iptables on compatible hardware and has no effect otherwise. Bug: 181603044 Test: atest under system/netd/tests Change-Id: I6916462c36f34332fc14c140be619d946c22d1f5 Merged-In: I6916462c36f34332fc14c140be619d946c22d1f5 (cherry picked from commit bfcaf7b8d786e69539b51156782ffa42379f1e68)
2021-05-27Merge sc-mainline-prod to master.Bill Rassieur
Change-Id: I061f8d677ef87c4f5ebe4f12745cc1c0491db536
2021-05-22Merge "Enable Async MTE in iptables." am: f5f0abbb69 am: f882a857cf am: ↵Treehugger Robot
c4908b9f5a am: 312a9f217e Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/1714176 Change-Id: I94d62eaf17d4969e1e2f65c307416ff355d8c983
2021-05-22Merge "Enable Async MTE in iptables." am: f5f0abbb69 am: f882a857cf am: ↵Treehugger Robot
c4908b9f5a Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/1714176 Change-Id: I10c829adb4fbcd24e546d3646f09090d7ca85220
2021-05-22Merge "Enable Async MTE in iptables." am: f5f0abbb69 am: f882a857cfTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/1714176 Change-Id: I0f7d895ff1416b39dcc215a5e3e628dff8ee909a
2021-05-22Merge "Enable Async MTE in iptables." am: f5f0abbb69android-s-beta-5android-s-beta-5Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/1714176 Change-Id: I29ac8a6ec47bc6c94ae93a751becac58f28c74a2
2021-05-22Merge "Enable Async MTE in iptables."Treehugger Robot
2021-05-21Enable Async MTE in iptables.Evgenii Stepanov
This change enables Async mode ARM MTE in iptables on compatible hardware and has no effect otherwise. Bug: 181603044 Test: atest under system/netd/tests Change-Id: I6916462c36f34332fc14c140be619d946c22d1f5
2021-04-03Merge changes from topic "b183485987" am: 90c8570e0b am: 74515b357f am: ↵Maciej Żenczykowski
7b1df5255c am: 89a5ed820a Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/1650938 Change-Id: I3414eaf9f56dde724b0fc18da4731cc866d15047
2021-04-03ANDROID: fix build for missing ETH_ALEN definition am: 7608e136bd am: ↵Maciej Żenczykowski
3799b1e13f am: f751c1415e am: 9ac820c64f Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/1650937 Change-Id: I5e2418aec5ae097d86a301e8a122dfde8ca7088b
2021-04-03ANDROID: update to 1.8.7 version am: 234472c9f2 am: d5b45ca17d am: ↵Maciej Żenczykowski
505f376396 am: c6bd25809e Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/1650936 Change-Id: I4829ec0914875f075b9c6fe237b67afa5e27331b
2021-04-03Merge tag 'v1.8.7' of git://git.netfilter.org/iptables am: 28a74be8ec am: ↵Maciej Żenczykowski
e3fbb32008 am: 51119072b7 am: a0c4e21d18 Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/1650935 Change-Id: Ie7f85d2f0a23096ada722d30d2ef36d66748704c
2021-04-03Merge tag 'v1.8.6' of git://git.netfilter.org/iptables am: de7a62aa82 am: ↵Maciej Żenczykowski
72f23c9bf9 am: af645f03f7 am: 5a7265ae38 Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/1650934 Change-Id: Ic61b7339e608a105bab3116f66fd65fe634bbdb7
2021-04-03Merge tag 'v1.8.5' of git://git.netfilter.org/iptables am: 903e1da7b1 am: ↵Maciej Żenczykowski
40cceefbdd am: 9f34af727c am: c7c2e89d09 Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/1650933 Change-Id: Ib210c54b59af420c3de71c46d26c31bacdda3e27
2021-04-03ANDROID: revert to upstream xt_IDLETIMER am: 3d6ee083d6 am: 218fa32d9f am: ↵Maciej Żenczykowski
d10bb0c810 am: da0526cc91 Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/1650932 Change-Id: Icef24768c661a44d6c2b287bc514a5cb109f0c13
2021-04-03Merge changes from topic "b183485987" am: 90c8570e0b am: 74515b357f am: ↵Maciej Żenczykowski
7b1df5255c am: 89a5ed820a Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/1650938 Change-Id: I96bb2d72814b44c0c5a84c6e7b5144c3a103ca8f
2021-04-03ANDROID: fix build for missing ETH_ALEN definition am: 7608e136bd am: ↵Maciej Żenczykowski
3799b1e13f am: f751c1415e am: 9ac820c64f Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/1650937 Change-Id: I6720d0bad8a189943b447f8b9157d3945bcad76c
2021-04-03ANDROID: update to 1.8.7 version am: 234472c9f2 am: d5b45ca17d am: ↵Maciej Żenczykowski
505f376396 am: c6bd25809e Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/1650936 Change-Id: I15e3517a9cefd26fa7e4a98fb2b3f9b51fb9e2ca
2021-04-03Merge tag 'v1.8.7' of git://git.netfilter.org/iptables am: 28a74be8ec am: ↵Maciej Żenczykowski
e3fbb32008 am: 51119072b7 am: a0c4e21d18 Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/1650935 Change-Id: Ibe5edf14abf40e34484b8136b69c82ae5a4d3212
2021-04-03Merge tag 'v1.8.6' of git://git.netfilter.org/iptables am: de7a62aa82 am: ↵Maciej Żenczykowski
72f23c9bf9 am: af645f03f7 am: 5a7265ae38 Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/1650934 Change-Id: I942a6b68951eb9cab6baa2ff4cef39a3ac4ac4f4
2021-04-03Merge tag 'v1.8.5' of git://git.netfilter.org/iptables am: 903e1da7b1 am: ↵Maciej Żenczykowski
40cceefbdd am: 9f34af727c am: c7c2e89d09 Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/1650933 Change-Id: I8e3f38fe4c3714c7491c33b0bafc87c68e33b18c
2021-04-03ANDROID: revert to upstream xt_IDLETIMER am: 3d6ee083d6 am: 218fa32d9f am: ↵Maciej Żenczykowski
d10bb0c810 am: da0526cc91 Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/1650932 Change-Id: I9b30b443c331fc0459cb7903fd4ae02fb521218a
2021-04-02Merge changes from topic "b183485987" am: 90c8570e0b am: 74515b357f am: ↵Maciej Żenczykowski
7b1df5255c Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/1650938 Change-Id: I05d9c24ef351a2f9b1661ebab619a61db6c16a3b
2021-04-02ANDROID: fix build for missing ETH_ALEN definition am: 7608e136bd am: ↵Maciej Żenczykowski
3799b1e13f am: f751c1415e Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/1650937 Change-Id: I2d1d6c9df66bb0908ecd75f3ddba7712819ff6a8
2021-04-02ANDROID: update to 1.8.7 version am: 234472c9f2 am: d5b45ca17d am: 505f376396Maciej Żenczykowski
Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/1650936 Change-Id: I0e3207c45956c509447a3381991fe2f19d574d6b
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-20 03:28:03 +0000