aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "replace NOTICE with a symlink to COPYING" am: e4e74127b8 am: 4e4cfdb239android-mainline-10.0.0_r8android-mainline-10.0.0_r6android10-mainline-resolv-releaseandroid10-mainline-networking-releaseMaciej Żenczykowski2019-07-191-339/+1
|\
| * Merge "replace NOTICE with a symlink to COPYING" am: e4e74127b8Maciej Żenczykowski2019-07-191-339/+1
| |\
| | * Merge "replace NOTICE with a symlink to COPYING"ndk-sysroot-r21Maciej Żenczykowski2019-07-191-339/+1
| |/|
| | * Merge "replace NOTICE with a symlink to COPYING"Maciej Żenczykowski2019-07-191-339/+1
| | |\
| | | * replace NOTICE with a symlink to COPYINGMaciej Żenczykowski2019-07-171-339/+1
| | |/
* | | Merge "Attempt to run netd tests when iptables is modified." am: 6ecc5e80e3 a...Maciej Żenczykowski2019-06-031-0/+10
|\| |
| * | Merge "Attempt to run netd tests when iptables is modified." am: 6ecc5e80e3Maciej Żenczykowski2019-06-031-0/+10
|/| |
| * | Merge "Attempt to run netd tests when iptables is modified."Maciej Żenczykowski2019-06-031-0/+10
| |\|
| | * Merge "Attempt to run netd tests when iptables is modified."Maciej Żenczykowski2019-06-041-0/+10
| |/|
| | * Attempt to run netd tests when iptables is modified.Lorenzo Colitti2019-06-041-0/+10
| |/
* | Merge "Merge iptables at v1.6.1 tag" am: 5bcb582c97 am: 73f3d9a7a1android-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseMaciej Żenczykowski2019-02-266-14/+106
|\ \
| * | Merge "Merge iptables at v1.6.1 tag" am: 5bcb582c97Maciej Żenczykowski2019-02-266-14/+106
| |\|
| | * Merge "Merge iptables at v1.6.1 tag"Maciej Żenczykowski2019-02-266-14/+106
| | |\
| | | * Merge "Merge iptables at v1.6.1 tag"Maciej Żenczykowski2019-02-266-14/+106
| | | |\
| | | | * Merge iptables at v1.6.1 tagMaciej Żenczykowski2019-02-266-14/+106
| | | |/|
| | | | * iptables: fix the wrong appending of jump verdict after the comment.Shyam Saini2017-01-262-6/+4
| | | | * iptables-save: exit with error if unable to open proc fileThomas Habets2017-01-182-8/+20
| | | | * extensions: libxt_rpfilter: add translation to nftLiping Zhang2017-01-161-0/+26
| | | | * extensions: libxt_connbytes: Add translation to nftLiping Zhang2017-01-161-0/+56
* | | | | Merge stage-aosp-master into pi-dev-plus-aospXin Li2019-02-250-0/+0
|\| | | |
| * | | | Merge stage-aosp-master into pi-dev-plus-aospXin Li2019-02-250-0/+0
| |\| | |
| | * | | DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li2019-02-200-0/+0
| | |\ \ \
* | | | | | Merge "Refactor OWNERS files for Android Core Networking" am: 5af33917d0 am: ...Junyu Lai2019-02-121-2/+2
|\| | | | |
| * | | | | Merge "Refactor OWNERS files for Android Core Networking" am: 5af33917d0Junyu Lai2019-02-121-2/+2
| |\| | | | | | |/ / / | |/| | |
| | * | | Merge "Refactor OWNERS files for Android Core Networking"Junyu Lai2019-02-121-2/+2
| | |\| |
| | | * | Merge "Refactor OWNERS files for Android Core Networking"Junyu Lai2019-02-121-2/+2
| | | |\ \
| | | | * | Refactor OWNERS files for Android Core Networkingjunyulai2019-02-121-2/+2
| | | |/ /
* | | | | Merge "Convert iptables to Android.bp" am: 57faecf268 am: 66242e3b31Dan Willemsen2018-12-1413-320/+343
|\| | | |
| * | | | Merge "Convert iptables to Android.bp" am: 57faecf268Dan Willemsen2018-12-1413-320/+343
| |\| | |
| | * | | Merge "Convert iptables to Android.bp"Dan Willemsen2018-12-1413-320/+343
| | |\| |
| | | * | Merge "Convert iptables to Android.bp"Dan Willemsen2018-12-1413-320/+343
| | | |\ \
| | | | * | Convert iptables to Android.bpDan Willemsen2018-11-2813-320/+343
* | | | | | [automerger skipped] Merge "DO NOT MERGE" am: 8921766525 -s ours am: db4e97c...Xin Li2018-12-100-0/+0
|\| | | | |
| * | | | | [automerger skipped] Merge "DO NOT MERGE" am: 8921766525 -s oursXin Li2018-12-100-0/+0
| |\| | | | | | |_|/ / | |/| | |
| | * | | [automerger skipped] Merge "DO NOT MERGE"Xin Li2018-12-100-0/+0
| |/| | | | | |/ /
| | * | Merge "DO NOT MERGE"Treehugger Robot2018-12-100-0/+0
| |/| |
| | * | DO NOT MERGEXin Li2018-12-070-0/+0
| |/| |
| | * | Snap for 4653471 from 210d3211fe074a86459ca5cf5270de0e8c23b482 to pi-releaseandroid-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-p-preview-5android-p-preview-4android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r2android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-platform-releasepie-gsipie-cuttlefish-testingpie-cts-releasepie-arcandroid-build-team Robot2018-03-142-0/+5
| | |\ \
| | * \ \ Snap for 4396096 from 17419e375a180d2b55274c8bf634f9ded674bd0a to pi-releaseandroid-p-preview-1p-preview-1android-build-team Robot2017-10-152-5/+20
| | |\ \ \
* | | | | | Turn on xt_bpf module in userspace am: 210d3211feChenbo Feng2018-03-140-0/+0
|\| | | | |
| * | | | | Turn on xt_bpf module in userspacemaster-cuttlefish-testing-releaseChenbo Feng2018-03-140-0/+0
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Turn on xt_bpf module in userspaceandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r3android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-p-preview-3android-p-preview-2android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-devp-preview-2Chenbo Feng2018-03-131-0/+3
* | | | | | UPSTREAM: extensions: libxt_bpf: fix missing __NR_bpf declaration am: 350bb6f1acRafael Buchbinder2018-03-130-0/+0
|\| | | | |
| * | | | | UPSTREAM: extensions: libxt_bpf: fix missing __NR_bpf declarationRafael Buchbinder2018-03-130-0/+0
| |\| | | |
| | * | | | UPSTREAM: extensions: libxt_bpf: fix missing __NR_bpf declarationRafael Buchbinder2018-03-131-0/+2
| | | |/ / | | |/| |
* | | | | Merge "Turn on xt_bpf module in userspace" am: f316c86a2b am: 386fe458f9Chenbo Feng2018-03-091-0/+3
|\| | | |
| * | | | Merge "Turn on xt_bpf module in userspace" am: f316c86a2bChenbo Feng2018-03-091-0/+3
| |\ \ \ \
| | * \ \ \ Merge "Turn on xt_bpf module in userspace"Chenbo Feng2018-03-091-0/+3
| | |\ \ \ \
| | | * \ \ \ Merge "Turn on xt_bpf module in userspace"android-wear-p-preview-2Treehugger Robot2018-03-091-0/+3
| | | |\ \ \ \
| | | | * | | | Turn on xt_bpf module in userspaceChenbo Feng2018-03-081-0/+3
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-17 16:11:09 +0000