aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | Merge "UPSTREAM: extensions: libxt_bpf: fix missing __NR_bpf declaration" am:...Rafael Buchbinder2018-03-091-0/+2
|\| | | | | | | | |_|_|_|/ / / |/| | | | | |
| * | | | | | Merge "UPSTREAM: extensions: libxt_bpf: fix missing __NR_bpf declaration" am:...Rafael Buchbinder2018-03-091-0/+2
|/| | | | | | | |/ / / / /
| * | | | | Merge "UPSTREAM: extensions: libxt_bpf: fix missing __NR_bpf declaration"Rafael Buchbinder2018-03-091-0/+2
| |\| | | |
| | * | | | Merge "UPSTREAM: extensions: libxt_bpf: fix missing __NR_bpf declaration"Treehugger Robot2018-03-091-0/+2
| |/| | | | | | |/ / /
| | * / / UPSTREAM: extensions: libxt_bpf: fix missing __NR_bpf declarationRafael Buchbinder2018-03-081-0/+2
| |/ / /
* | / / Merge "Use -Werror in external/iptables" am: 447f5e3dd7 am: f86d7ad9ad am: 7b...Chih-hung Hsieh2017-10-152-5/+20
|\| | | | |/ / |/| |
| * | Merge "Use -Werror in external/iptables" am: 447f5e3dd7 am: f86d7ad9adChih-hung Hsieh2017-10-152-5/+20
|/| |
| * | Merge "Use -Werror in external/iptables" am: 447f5e3dd7Chih-hung Hsieh2017-10-152-5/+20
| |\ \
| | * | Merge "Use -Werror in external/iptables"Chih-hung Hsieh2017-10-152-5/+20
| |/| |
| | * | Merge "Use -Werror in external/iptables"Chih-hung Hsieh2017-10-132-5/+20
| | |\ \
| | | * | Use -Werror in external/iptablesChih-Hung Hsieh2017-10-102-5/+20
| | |/ /
* | | | 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
| | | |/ /
* | | | | 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
| | | |/ /
* | | | | 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
| | | | |\|