aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Suppress warnings in external/iptables." am: 8c7efe912f am: a4283108b9android-o-preview-1o-previewAurimas Liutikas2017-02-212-4/+13
|\
| * Merge "Suppress warnings in external/iptables." am: 8c7efe912fAurimas Liutikas2017-02-212-4/+13
| |\
| | * Merge "Suppress warnings in external/iptables."Aurimas Liutikas2017-02-212-4/+13
| |/|
| | * Merge "Suppress warnings in external/iptables."Aurimas Liutikas2017-02-212-4/+13
| | |\
| | | * Suppress warnings in external/iptables.Aurimas Liutikas2017-02-172-4/+13
| | |/
* | | Merge "iptables: Change locking semantics." am: 7ce69df55d am: 850b49ca1f am:...Narayan Kamath2017-01-236-21/+67
|\| |
| * | Merge "iptables: Change locking semantics." am: 7ce69df55d am: 850b49ca1fNarayan Kamath2017-01-236-21/+67
| |\ \
| | * \ Merge "iptables: Change locking semantics." am: 7ce69df55dNarayan Kamath2017-01-236-21/+67
| | |\ \
| | | * | Merge "iptables: Change locking semantics."Narayan Kamath2017-01-236-21/+67
| | | |\|
| | | | * Merge "iptables: Change locking semantics."Narayan Kamath2017-01-236-21/+67
| | | | |\
| | | | | * iptables: Change locking semantics.Narayan Kamath2017-01-236-21/+67
| | | | |/
* | | | | Merge "iptables: flush stdout after every verbose log." am: ab2b45c965 am: 19...Narayan Kamath2017-01-232-2/+6
|\| | | |
| * | | | Merge "iptables: flush stdout after every verbose log." am: ab2b45c965 am: 19...Narayan Kamath2017-01-232-2/+6
| |\| | |
| | * | | Merge "iptables: flush stdout after every verbose log." am: ab2b45c965Narayan Kamath2017-01-232-2/+6
| |/| | | | | |/ /
| | * / Merge "iptables: flush stdout after every verbose log."Narayan Kamath2017-01-232-2/+6
| |/| | | | |/
| | * Merge "iptables: flush stdout after every verbose log."Narayan Kamath2017-01-232-2/+6
| |/|
| | * iptables: flush stdout after every verbose log.Narayan Kamath2017-01-192-2/+6
| |/
* | Merge "Build shared library version of libxtables." am: 8f090169d0 am: 998ec4...Dan Willemsen2016-09-171-2/+21
|\|
| * Merge "Build shared library version of libxtables." am: 8f090169d0 am: 998ec4...Dan Willemsen2016-09-171-2/+21
| |\
| | * Merge "Build shared library version of libxtables." am: 8f090169d0Dan Willemsen2016-09-171-2/+21
| | |\
| | | * Merge "Build shared library version of libxtables."Dan Willemsen2016-09-171-2/+21
| | |/|
| | | * Merge "Build shared library version of libxtables."Dan Willemsen2016-09-171-2/+21
| | |/|
| | | * Build shared library version of libxtables.Henry Ptaisnski2016-09-161-2/+21
| | |/
* | | Merge "Add filter_init to prerequisites" am: 4825a1b564 am: ea08c54f19 am: 0a...Shinichiro Hamaji2016-04-211-1/+1
|\| |
| * | Merge "Add filter_init to prerequisites" am: 4825a1b564 am: ea08c54f19Shinichiro Hamaji2016-04-211-1/+1
| |\|
| | * Merge "Add filter_init to prerequisites" am: 4825a1b564Shinichiro Hamaji2016-04-211-1/+1
| |/|
| | * Merge "Add filter_init to prerequisites"Shinichiro Hamaji2016-04-211-1/+1
| | |\
| | | * Merge "Add filter_init to prerequisites"Shinichiro Hamaji2016-04-211-1/+1
| | |/|
| | | * Add filter_init to prerequisitesShinichiro Hamaji2016-04-191-1/+1
| | |/
* | | Tell the build system to copy notice files. am: ce477f9Ying Wang2016-04-091-0/+4
|\| |
| * | Tell the build system to copy notice files.Ying Wang2016-04-091-0/+4
|/| |
| * | Tell the build system to copy notice files.android-wear-n-preview-2android-wear-n-preview-1android-wear-7.1.1_r1android-n-preview-5android-n-preview-4android-n-preview-3android-n-mr2-preview-2android-n-mr2-preview-1android-n-mr1-preview-2android-n-mr1-preview-1android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7android-n-iot-release-ihome-igv1android-n-iot-preview-4android-n-iot-preview-2android-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r3android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r2android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-cts-7.1_r1android-7.1.2_r9android-7.1.2_r8android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r39android-7.1.2_r38android-7.1.2_r37android-7.1.2_r36android-7.1.2_r33android-7.1.2_r32android-7.1.2_r30android-7.1.2_r3android-7.1.2_r29android-7.1.2_r28android-7.1.2_r27android-7.1.2_r25android-7.1.2_r24android-7.1.2_r23android-7.1.2_r2android-7.1.2_r19android-7.1.2_r18android-7.1.2_r17android-7.1.2_r16android-7.1.2_r15android-7.1.2_r14android-7.1.2_r13android-7.1.2_r12android-7.1.2_r11android-7.1.2_r10android-7.1.2_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r61android-7.1.1_r60android-7.1.1_r6android-7.1.1_r59android-7.1.1_r58android-7.1.1_r57android-7.1.1_r56android-7.1.1_r55android-7.1.1_r54android-7.1.1_r53android-7.1.1_r52android-7.1.1_r51android-7.1.1_r50android-7.1.1_r49android-7.1.1_r48android-7.1.1_r47android-7.1.1_r46android-7.1.1_r45android-7.1.1_r44android-7.1.1_r43android-7.1.1_r42android-7.1.1_r41android-7.1.1_r40android-7.1.1_r4android-7.1.1_r39android-7.1.1_r38android-7.1.1_r35android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r3android-7.1.1_r28android-7.1.1_r27android-7.1.1_r26android-7.1.1_r25android-7.1.1_r24android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1android-7.1.0_r7android-7.1.0_r6android-7.1.0_r5android-7.1.0_r4android-7.1.0_r3android-7.1.0_r2android-7.1.0_r1nougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-security-releasenougat-mr2-releasenougat-mr2-pixel-releasenougat-mr2-devnougat-mr1.8-releasenougat-mr1.7-releasenougat-mr1.6-releasenougat-mr1.5-releasenougat-mr1.4-releasenougat-mr1.3-releasenougat-mr1.2-releasenougat-mr1.1-releasenougat-mr1-wear-releasenougat-mr1-volantis-releasenougat-mr1-security-releasenougat-mr1-releasenougat-mr1-flounder-releasenougat-mr1-devnougat-mr1-cts-releasenougat-iot-releasenougat-dr1-releasenougat-devn-mr2-preview-1n-mr1-preview-1n-iot-preview-4n-iot-preview-2Ying Wang2016-04-081-0/+4
|/ /
* | am c4afcd7f: am 16752d9f: (-s ours) am f2a192e3: Merge "Add \'-w\' option to ...android-n-preview-2android-n-preview-1n-preview-2n-preview-1Yusuke Sato2015-08-270-0/+0
|\|
| * am 16752d9f: (-s ours) am f2a192e3: Merge "Add \'-w\' option to ip[6]tables-r...brillo-m9-releasebrillo-m9-devbrillo-m8-releasebrillo-m8-devbrillo-m10-releasebrillo-m10-devYusuke Sato2015-08-270-0/+0
| |\
| | * am f2a192e3: Merge "Add \'-w\' option to ip[6]tables-restore"brillo-m7-releasebrillo-m7-mr-devbrillo-m7-devYusuke Sato2015-08-262-6/+30
| | |\
* | | | am 508f1659: am 0304f3bd: (-s ours) am 745484a5: Merge "Add ip[6]tables-resto...Yusuke Sato2015-08-270-0/+0
|\| | |
| * | | am 0304f3bd: (-s ours) am 745484a5: Merge "Add ip[6]tables-restore and ip[6]t...Yusuke Sato2015-08-270-0/+0
| |\| |
| | * | am 745484a5: Merge "Add ip[6]tables-restore and ip[6]tables-save to /system/bin"Yusuke Sato2015-08-191-0/+8
| | |\ \
* | | | | am 968fa2ee: am a2981544: (-s ours) am 592f0b0c: Merge "build: wildcard isn\'...Dan Willemsen2015-08-270-0/+0
|\| | | |
| * | | | am a2981544: (-s ours) am 592f0b0c: Merge "build: wildcard isn\'t guaranteed ...Dan Willemsen2015-08-270-0/+0
| |\| | |
| | * | | am 592f0b0c: Merge "build: wildcard isn\'t guaranteed to be sorted"Dan Willemsen2015-08-121-3/+3
| | |\ \ \
* | | | | | am 3dad54a1: am a41cf02b: (-s ours) am 53b5e80f: Merge "extensions: libxt_soc...Lorenzo Colitti2015-08-270-0/+0
|\| | | | |
| * | | | | am a41cf02b: (-s ours) am 53b5e80f: Merge "extensions: libxt_socket: add --re...Lorenzo Colitti2015-08-270-0/+0
| |\| | | |
| | * | | | am 53b5e80f: Merge "extensions: libxt_socket: add --restore-skmark option"Lorenzo Colitti2015-08-122-0/+79
| | |\ \ \ \
* | | | | | | am b48d9516: am f2a192e3: Merge "Add \'-w\' option to ip[6]tables-restore"Yusuke Sato2015-08-262-6/+30
|\| | | | | |
| * | | | | | am f2a192e3: Merge "Add \'-w\' option to ip[6]tables-restore"Yusuke Sato2015-08-262-6/+30
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Merge "Add '-w' option to ip[6]tables-restore"Yusuke Sato2015-08-262-6/+30
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | | * | | | Add '-w' option to ip[6]tables-restoreYusuke Sato2015-08-212-6/+30
| | |/ / / /
* | | | | | am d26b57b6: am 745484a5: Merge "Add ip[6]tables-restore and ip[6]tables-save...Yusuke Sato2015-08-191-0/+8
|\| | | | |
| * | | | | am 745484a5: Merge "Add ip[6]tables-restore and ip[6]tables-save to /system/bin"Yusuke Sato2015-08-191-0/+8
| |\| | | |