aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* release-request-ccd04736-6e66-4825-a227-ecd69d8b5337-for-git_oc-mr1-release-4...android-vts-8.1_r9android-vts-8.1_r8android-vts-8.1_r7android-vts-8.1_r6android-vts-8.1_r5android-vts-8.1_r4android-vts-8.1_r3android-vts-8.1_r13android-vts-8.1_r12android-vts-8.1_r11android-vts-8.1_r10android-o-mr1-preview-2android-o-mr1-preview-1android-cts-8.1_r9android-cts-8.1_r8android-cts-8.1_r7android-cts-8.1_r6android-cts-8.1_r5android-cts-8.1_r4android-cts-8.1_r3android-cts-8.1_r20android-cts-8.1_r2android-cts-8.1_r19android-cts-8.1_r18android-cts-8.1_r17android-cts-8.1_r16android-cts-8.1_r15android-cts-8.1_r14android-cts-8.1_r13android-cts-8.1_r12android-cts-8.1_r11android-cts-8.1_r10android-cts-8.1_r1android-8.1.0_r9android-8.1.0_r80android-8.1.0_r8android-8.1.0_r79android-8.1.0_r78android-8.1.0_r77android-8.1.0_r76android-8.1.0_r75android-8.1.0_r74android-8.1.0_r73android-8.1.0_r72android-8.1.0_r71android-8.1.0_r70android-8.1.0_r7android-8.1.0_r69android-8.1.0_r68android-8.1.0_r67android-8.1.0_r66android-8.1.0_r65android-8.1.0_r64android-8.1.0_r63android-8.1.0_r62android-8.1.0_r61android-8.1.0_r60android-8.1.0_r6android-8.1.0_r53android-8.1.0_r52android-8.1.0_r51android-8.1.0_r50android-8.1.0_r5android-8.1.0_r48android-8.1.0_r47android-8.1.0_r46android-8.1.0_r45android-8.1.0_r43android-8.1.0_r42android-8.1.0_r41android-8.1.0_r40android-8.1.0_r4android-8.1.0_r39android-8.1.0_r38android-8.1.0_r37android-8.1.0_r36android-8.1.0_r35android-8.1.0_r33android-8.1.0_r32android-8.1.0_r31android-8.1.0_r30android-8.1.0_r3android-8.1.0_r29android-8.1.0_r28android-8.1.0_r27android-8.1.0_r26android-8.1.0_r25android-8.1.0_r23android-8.1.0_r22android-8.1.0_r21android-8.1.0_r20android-8.1.0_r2android-8.1.0_r19android-8.1.0_r18android-8.1.0_r17android-8.1.0_r16android-8.1.0_r15android-8.1.0_r14android-8.1.0_r13android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10android-8.1.0_r1security-oc-mr1-releaseoreo-mr1-vts-releaseoreo-mr1-security-releaseoreo-mr1-s1-releaseoreo-mr1-releaseoreo-mr1-cuttlefish-testingoreo-mr1-cts-releaseoreo-m8-releaseoreo-m7-releaseoreo-m6-s4-releaseoreo-m6-s3-releaseoreo-m6-s2-releaseoreo-m5-releaseoreo-m4-s9-releaseoreo-m4-s8-releaseoreo-m4-s7-releaseoreo-m4-s6-releaseoreo-m4-s5-releaseoreo-m4-s4-releaseoreo-m4-s3-releaseoreo-m4-s2-releaseoreo-m4-s12-releaseoreo-m4-s11-releaseoreo-m4-s10-releaseoreo-m4-s1-releaseoreo-m3-releaseoreo-m2-s5-releaseoreo-m2-s4-releaseoreo-m2-s3-releaseoreo-m2-s2-releaseoreo-m2-s1-releaseoreo-m2-releaseandroid-build-team Robot2017-07-071-1/+0
|\
| * Merge "Trim OWNERS" am: 204461a170 am: 8ae1dffe73 am: 2ab26b893candroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7android-o-mr1-iot-preview-6oreo-mr1-iot-releaseoreo-mr1-devoreo-mr1-1.2-iot-releaseo-mr1-iot-preview-8o-mr1-iot-preview-7o-mr1-iot-preview-6Erik Kline2017-07-061-1/+0
| |\
| | * Merge "Trim OWNERS" am: 204461a170 am: 8ae1dffe73Erik Kline2017-07-061-1/+0
| | |\
| | | * Merge "Trim OWNERS" am: 204461a170Erik Kline2017-07-061-1/+0
| | | |\
| | | | * Merge "Trim OWNERS"Erik Kline2017-07-061-1/+0
| | | |/|
| | | | * Merge "Trim OWNERS"Treehugger Robot2017-07-061-1/+0
| | | | |\
| | | | | * Trim OWNERSErik Kline2017-07-061-1/+0
| | | | |/
* | | | | release-request-36fe639f-9404-4c33-86fb-47bc4ab2221f-for-git_oc-mr1-release-4...android-build-team Robot2017-06-221-0/+3
|\| | | |
| * | | | Merge "Add OWNERS in external/iptables" am: 9eeff146a0 am: c0d5e2599a am: 1e6...Chih-Hung Hsieh2017-06-211-0/+3
| |\| | |
| | * | | Merge "Add OWNERS in external/iptables" am: 9eeff146a0 am: c0d5e2599aChih-Hung Hsieh2017-06-211-0/+3
| |/| | | | | |/ /
| | * | Merge "Add OWNERS in external/iptables" am: 9eeff146a0Chih-Hung Hsieh2017-06-211-0/+3
| | |\ \
| | | * | Merge "Add OWNERS in external/iptables"Chih-Hung Hsieh2017-06-211-0/+3
| | | |\|
| | | | * Merge "Add OWNERS in external/iptables"Treehugger Robot2017-06-211-0/+3
| | | | |\
| | | | | * Add OWNERS in external/iptablesChih-Hung Hsieh2017-06-201-0/+3
| | | | |/
* | | | | release-request-703268f3-975f-4a98-83d7-cbf58019eda0-for-git_oc-mr1-release-4...android-build-team Robot2017-06-046-37/+37
|\| | | |
| * | | | Merge "UPSTREAM: iptables: insist that the lock is held." am: c9c53dbd72 am: ...oreo-dr1-devLorenzo Colitti2017-06-016-37/+37
|/| | | | | |/ / /
| * | | Merge "UPSTREAM: iptables: insist that the lock is held." am: c9c53dbd72 am: ...Lorenzo Colitti2017-06-016-37/+37
| |\ \ \
| | * | | Merge "UPSTREAM: iptables: insist that the lock is held." am: c9c53dbd72Lorenzo Colitti2017-06-016-37/+37
| | |\| |
| | | * | Merge "UPSTREAM: iptables: insist that the lock is held."Lorenzo Colitti2017-06-016-37/+37
| | | |\|
| | | | * Merge "UPSTREAM: iptables: insist that the lock is held."Treehugger Robot2017-06-016-37/+37
| | | | |\
| | | | | * UPSTREAM: iptables: insist that the lock is held.Lorenzo Colitti2017-05-316-37/+37
| | | | |/
* | | | | Always build the iptables lock when building iptables. am: 957abd4643android-wear-8.0.0_r2android-wear-8.0.0_r1Lorenzo Colitti2017-04-050-0/+0
|\| | | |
| * | | | Always build the iptables lock when building iptables.Lorenzo Colitti2017-04-050-0/+0
| |\ \ \ \
| | * | | | Always build the iptables lock when building iptables.android-wear-o-preview-4android-wear-o-preview-3android-vts-8.0_r2android-vts-8.0_r1android-o-iot-preview-5oreo-devo-iot-preview-5Lorenzo Colitti2017-04-051-0/+4
* | | | | | Merge "Always build the iptables lock when building iptables." am: bb975c0535...Lorenzo Colitti2017-04-051-0/+4
|\| | | | | | |/ / / / |/| | | |
| * | | | Merge "Always build the iptables lock when building iptables." am: bb975c0535...Lorenzo Colitti2017-04-051-0/+4
|/| | | | | |/ / /
| * | | Merge "Always build the iptables lock when building iptables." am: bb975c0535Lorenzo Colitti2017-04-051-0/+4
| |\| |
| | * | Merge "Always build the iptables lock when building iptables."Lorenzo Colitti2017-04-051-0/+4
| | |\|
| | | * Merge "Always build the iptables lock when building iptables."Treehugger Robot2017-04-051-0/+4
| | |/|
| | | * Always build the iptables lock when building iptables.Lorenzo Colitti2017-04-051-0/+4
* | | | Merge changes from topic 'iptables-1.6.1' am: c784fc47e6 am: ff45753ae3Lorenzo Colitti2017-03-24315-1919/+23599
|\| | |
| * | | Merge changes from topic 'iptables-1.6.1' am: c784fc47e6Lorenzo Colitti2017-03-24315-1919/+23599
| |\| |
| | * | Merge changes from topic 'iptables-1.6.1'Lorenzo Colitti2017-03-24315-1919/+23599
| | |\|
| | | * Merge changes from topic 'iptables-1.6.1'Lorenzo Colitti2017-03-24315-1919/+23599
| | | |\
| | | | * Android-specific changes for upgrade to iptables-1.6.1.Lorenzo Colitti2017-03-228-16/+30
| | | | * iptables-restore: support acquiring the lock.Lorenzo Colitti2017-03-226-33/+122
| | | | * iptables: remove duplicated argument parsing codeLorenzo Colitti2017-03-226-160/+95
| | | | * iptables: move XT_LOCK_NAME from CFLAGS to config.h.Lorenzo Colitti2017-03-222-2/+5
| | | | * iptables: set the path of the lock file via a configure option.Lorenzo Colitti2017-03-222-4/+8
| | | | * xshared: using the blocking file lock request when we wait indefinitelyLiping Zhang2017-03-221-11/+14
| | | | * xshared: do not lock again and again if "-w" option is not specifiedLiping Zhang2017-03-221-7/+4
| | | | * Update to iptables 1.6.1.Lorenzo Colitti2017-03-22308-1812/+23517
| | | | |\
| | | | | * iptables 1.6.1 releasePablo Neira Ayuso2017-01-161-1/+1
| | | | | * build: Fix two compile errors during out-of-tree buildKeno Fischer2017-01-162-2/+2
| | | | | * libxtables: xtables: Use getnameinfo()Shyam Saini2016-12-201-4/+11
| | | | | * libxtables: xtables: remove unnecessary debug codeShyam Saini2016-12-201-26/+3
| | | | | * iptables: on revision mismatch, do not call print/saveWillem de Bruijn2016-12-112-8/+28
| | | | | * extensions: libxt_bpf: support ebpf pinned objectsWillem de Bruijn2016-12-104-50/+216
| | | | | * extensions: LOG: add log flags translation to nftLiping Zhang2016-11-292-8/+52
| | | | | * tcp_xlate: Enclose LH flag values in parenthesesPhil Sutter2016-11-291-2/+2