aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Remove LOCAL_CLANG" am: 989b8c6678 am: 842c7f0c1a am: 2530b778d5 am: 2...Lennart Wieboldt2017-07-261-1/+0
|\
| * Merge "Remove LOCAL_CLANG" am: 989b8c6678 am: 842c7f0c1a am: 2530b778d5Lennart Wieboldt2017-07-261-1/+0
|/|
| * Merge "Remove LOCAL_CLANG" am: 989b8c6678 am: 842c7f0c1aLennart Wieboldt2017-07-261-1/+0
| |\
| | * Merge "Remove LOCAL_CLANG" am: 989b8c6678Lennart Wieboldt2017-07-261-1/+0
| | |\
| | | * Merge "Remove LOCAL_CLANG"Lennart Wieboldt2017-07-261-1/+0
| | | |\
| | | | * Merge "Remove LOCAL_CLANG"Treehugger Robot2017-07-261-1/+0
| | | | |\
| | | | | * Remove LOCAL_CLANGLennart Wieboldt2017-07-251-1/+0
| | | | |/
* | | | | Merge "Add OWNERS in external/iproute2" am: a3f2f94808 am: 8d49b18dff am: 9be...android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-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-6Lorenzo Colitti2017-07-071-0/+2
|\| | | |
| * | | | Merge "Add OWNERS in external/iproute2" am: a3f2f94808 am: 8d49b18dffLorenzo Colitti2017-07-071-0/+2
|/| | | | | |/ / /
| * / / Merge "Add OWNERS in external/iproute2" am: a3f2f94808Lorenzo Colitti2017-07-071-0/+2
|/| | | | |/ /
| * / Merge "Add OWNERS in external/iproute2"Lorenzo Colitti2017-07-071-0/+2
|/| | | |/
| * Merge "Add OWNERS in external/iproute2"Lorenzo Colitti2017-07-071-0/+2
| |\
| | * Add OWNERS in external/iproute2Lorenzo Colitti2017-07-071-0/+2
| |/
* | Merge "Update UID routing to upstream implementation." am: b072143d78 am: e3d...android-wear-o-preview-4android-wear-o-preview-3android-wear-8.0.0_r2android-wear-8.0.0_r1android-vts-8.0_r9android-vts-8.0_r8android-vts-8.0_r7android-vts-8.0_r6android-vts-8.0_r2android-vts-8.0_r13android-vts-8.0_r12android-vts-8.0_r11android-vts-8.0_r10android-vts-8.0_r1android-o-preview-4android-o-preview-3android-o-preview-2android-o-preview-1android-o-iot-preview-5android-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r24android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10android-cts-8.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-8.0.0_r36android-8.0.0_r35android-8.0.0_r34android-8.0.0_r33android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-8.0.0_r27android-8.0.0_r26android-8.0.0_r25android-8.0.0_r24android-8.0.0_r23android-8.0.0_r22android-8.0.0_r21android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1security-oc-releaseoreo-vts-releaseoreo-security-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseoreo-dr3-releaseoreo-dr2-releaseoreo-dr1-releaseoreo-dr1-devoreo-devoreo-cts-releaseo-preview-4o-preview-3o-preview-2o-previewo-iot-preview-5Lorenzo Colitti2017-01-064-29/+33
|\|
| * Merge "Update UID routing to upstream implementation." am: b072143d78 am: e3d...Lorenzo Colitti2017-01-064-29/+33
| |\
| | * Merge "Update UID routing to upstream implementation." am: b072143d78Lorenzo Colitti2017-01-064-29/+33
| |/|
| | * Merge "Update UID routing to upstream implementation."Lorenzo Colitti2017-01-064-29/+33
| |/|
| | * Merge "Update UID routing to upstream implementation."Treehugger Robot2017-01-064-29/+33
| |/|
| | * Update UID routing to upstream implementation.Lorenzo Colitti2016-12-194-29/+33
| |/
* | ss: Support displaying and filtering on socket marks. am: d4db01bf3f am: db25...Lorenzo Colitti2016-09-244-3/+87
|\|
| * ss: Support displaying and filtering on socket marks. am: d4db01bf3fLorenzo Colitti2016-09-244-3/+87
| |\
| | * ss: Support displaying and filtering on socket marks.android-wear-7.1.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_r1nougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-security-releasenougat-mr2-releasenougat-mr2-pixel-releasenougat-mr2-devnougat-mr1-wear-releaseLorenzo Colitti2016-09-244-3/+87
| | |\
| | | * ss: Support displaying and filtering on socket marks.android-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.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_r1nougat-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-volantis-releasenougat-mr1-security-releasenougat-mr1-releasenougat-mr1-flounder-releasenougat-mr1-devnougat-mr1-cts-releaseLorenzo Colitti2016-09-234-3/+87
| | |/
* | | Merge "Merge "ss: remove wtf." am: 4bf8496 am: d9cdcb0 am: 1404f4c am: 465a65...Josh Gao2016-05-120-0/+0
|\| |
| * | Merge "Merge "ss: remove wtf." am: 4bf8496 am: d9cdcb0 am: 1404f4c am: 465a65...Android Build Merger (Role)2016-05-120-0/+0
| |\ \
| | * \ Merge "ss: remove wtf." am: 4bf8496 am: d9cdcb0 am: 1404f4c am: 465a65c am: f...Josh Gao2016-05-120-0/+0
| | |\ \
| | | * \ Merge "ss: remove wtf." am: 4bf8496 am: d9cdcb0 am: 1404f4c am: 465a65cJosh Gao2016-05-120-0/+0
| | | |\ \
* | | | | | Merge "ss: remove wtf." am: 4bf8496 am: d9cdcb0 am: 1404f4c am: 465a65c am: f...Josh Gao2016-05-120-0/+0
|\| | | | |
| * | | | | Merge "ss: remove wtf." am: 4bf8496 am: d9cdcb0 am: 1404f4c am: 465a65c am: f...Josh Gao2016-05-120-0/+0
| |\ \ \ \ \ | | |/ / / / | |/| | | / | | | |_|/ | | |/| |
| | * | | Merge "ss: remove wtf." am: 4bf8496 am: d9cdcb0 am: 1404f4c am: 465a65candroid-wear-n-preview-2android-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-dr1-releaseJosh Gao2016-05-121-1/+1
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Merge "ss: remove wtf." am: 4bf8496 am: d9cdcb0 am: 1404f4candroid-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.0_r9android-cts-7.0_r8android-cts-7.0_r7android-cts-7.0_r6android-cts-7.0_r5android-cts-7.0_r4android-cts-7.0_r33android-cts-7.0_r32android-cts-7.0_r31android-cts-7.0_r30android-cts-7.0_r3android-cts-7.0_r29android-cts-7.0_r28android-cts-7.0_r27android-cts-7.0_r26android-cts-7.0_r25android-cts-7.0_r24android-cts-7.0_r23android-cts-7.0_r22android-cts-7.0_r21android-cts-7.0_r20android-cts-7.0_r2android-cts-7.0_r19android-cts-7.0_r18android-cts-7.0_r17android-cts-7.0_r16android-cts-7.0_r15android-cts-7.0_r14android-cts-7.0_r13android-cts-7.0_r12android-cts-7.0_r11android-cts-7.0_r10android-cts-7.0_r1android-7.0.0_r7android-7.0.0_r6android-7.0.0_r5android-7.0.0_r4android-7.0.0_r36android-7.0.0_r35android-7.0.0_r34android-7.0.0_r33android-7.0.0_r32android-7.0.0_r31android-7.0.0_r30android-7.0.0_r3android-7.0.0_r29android-7.0.0_r28android-7.0.0_r27android-7.0.0_r24android-7.0.0_r21android-7.0.0_r19android-7.0.0_r17android-7.0.0_r15android-7.0.0_r14android-7.0.0_r13android-7.0.0_r12android-7.0.0_r1nougat-releasenougat-mr0.5-releasenougat-iot-releasenougat-devnougat-cts-releasen-iot-preview-4n-iot-preview-2Josh Gao2016-05-121-1/+1
| | |/ /
* | / / Merge "ss: remove wtf." am: 4bf8496 am: d9cdcb0 am: 1404f4cJosh Gao2016-04-281-1/+1
|\| | | | |/ / |/| |
| * | Merge "ss: remove wtf." am: 4bf8496 am: d9cdcb0Josh Gao2016-04-281-1/+1
|/| | | |/
| * Merge "ss: remove wtf." am: 4bf8496Josh Gao2016-04-281-1/+1
|/|
| * Merge "ss: remove wtf."Josh Gao2016-04-281-1/+1
| |\
| | * Merge "ss: remove wtf."Josh Gao2016-04-281-1/+1
| |/|
| | * ss: remove wtf.Josh Gao2016-04-271-1/+1
| |/
* | Merge "Fix GCC builds of \'ss\' by insisting on clang."android-wear-n-preview-1android-n-preview-2android-n-preview-1n-preview-2n-preview-1Elliott Hughes2016-02-061-2/+2
|\|
| * Merge "Fix GCC builds of 'ss' by insisting on clang."brillo-m10-releasebrillo-m10-devElliott Hughes2016-02-061-2/+2
| |\
| | * Fix GCC builds of 'ss' by insisting on clang.Elliott Hughes2016-02-051-2/+2
| |/
* | Merge "Add the ability to compile ss."Elliott Hughes2016-02-060-0/+0
|\|
| * Merge "Add the ability to compile ss."Elliott Hughes2016-02-062-1/+41
| |\
| | * Add the ability to compile ss.Lorenzo Colitti2016-02-052-1/+41
| |/
* | Merge "Merge remote-tracking branch \'aosp/upstream-master\' into mymerge"Elliott Hughes2016-02-06276-3066/+19895
|\|
| * Merge "Merge remote-tracking branch 'aosp/upstream-master' into mymerge"Elliott Hughes2016-02-06276-3066/+19895
| |\
| | * Merge remote-tracking branch 'aosp/upstream-master' into mymergeElliott Hughes2016-02-05276-3066/+19895
| |/|
| | * ss: support closing inet sockets via SOCK_DESTROY.Lorenzo Colitti2016-01-182-2/+53
| | * libnetlink: don't print NETLINK_SOCK_DIAG errors in rtnl_talkLorenzo Colitti2016-01-181-2/+4
| | * ip-link: fix man page warningsThomas Faivre2016-01-181-51/+51
| | * vxlan: fix help and man textThomas Faivre2016-01-182-2/+3
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 18:53:21 +0000