aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Snap for 6877830 from 2e8f6ce8abca9839b50176a33b888ad4517422c4 to sdk-...sdk-releaseandroid-build-prod (mdb)2020-10-010-0/+0
|\
| * Snap for 6877830 from 2e8f6ce8abca9839b50176a33b888ad4517422c4 to sdk-releaseandroid-build-prod (mdb)2020-10-010-0/+0
|/|
| * Merge "Add METADATA to iproute2: GPL=RESTRICTED" am: 7c3c47da47 am: d6e38af5a7HEADmasterMaciej Żenczykowski2020-04-301-0/+3
| |\
| * \ [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into st...Xin Li2020-04-100-0/+0
| |\ \
| * \ \ [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901...Xin Li2020-03-190-0/+0
| |\ \ \
| * \ \ \ Merge "ANDROID: Fix 32-bit x86 iproute2 on 64-bit kernel" am: 68454405a4 am: ...android-mainline-11.0.0_r1android11-mainline-releaseandroid11-devAutomerger Merge Worker2020-01-243-2/+24
| |\ \ \ \
| * \ \ \ \ Merge "Attempt to run netd tests when iproute2 is modified." am: de0e714027 a...Lorenzo Colitti2019-06-131-0/+10
| |\ \ \ \ \
* | \ \ \ \ \ Merge "Snap for 6660490 from d6e38af5a74427c46e91147f6e39f0ebb11af199 to sdk-...platform-tools-30.0.4android-build-prod (mdb)2020-07-080-0/+0
|\ \ \ \ \ \ \
| * | | | | | | Snap for 6660490 from d6e38af5a74427c46e91147f6e39f0ebb11af199 to sdk-releaseandroid-build-prod (mdb)2020-07-080-0/+0
|/| | | | | | | | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge "Add METADATA to iproute2: GPL=RESTRICTED" am: 7c3c47da47Maciej Żenczykowski2020-04-301-0/+3
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li2020-04-090-0/+0
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-maste...Xin Li2020-03-190-0/+0
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | / | | | |_|_|/ | | |/| | |
| * | | | | DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-masterXin Li2020-03-180-0/+0
| |\| | | |
| | * | | | Merge "ANDROID: Fix 32-bit x86 iproute2 on 64-bit kernel" am: 68454405a4 am: ...Automerger Merge Worker2020-01-243-2/+24
| | |\ \ \ \ | | |/ / / / | |/| | | / | | | |_|/ | | |/| |
* | | | | Merge "Snap for 6533464 from 7c3c47da471933d86b31f7d39e80f27ccdaae4c1 to sdk-...platform-tools-30.0.3platform-tools-30.0.2android-build-prod (mdb)2020-05-271-0/+3
|\ \ \ \ \
| * | | | | Snap for 6533464 from 7c3c47da471933d86b31f7d39e80f27ccdaae4c1 to sdk-releaseandroid-build-prod (mdb)2020-05-271-0/+3
|/| | | | | | | |_|/ / | |/| | |
| * | | | Merge "Add METADATA to iproute2: GPL=RESTRICTED"Maciej Żenczykowski2020-04-301-0/+3
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Add METADATA to iproute2: GPL=RESTRICTEDBob Badour2020-04-281-0/+3
| |/ / /
* | | | Merge "Snap for 6290619 from cd4884e9d648566545e13d7c7aa25dbe7e700f4e to sdk-...platform-tools-30.0.1platform-tools-30.0.0android-build-prod (mdb)2020-03-120-0/+0
|\ \ \ \
| * | | | Snap for 6290619 from cd4884e9d648566545e13d7c7aa25dbe7e700f4e to sdk-releaseandroid-build-prod (mdb)2020-03-120-0/+0
|/| | | | | |/ / /
| * | | Merge "ANDROID: Fix 32-bit x86 iproute2 on 64-bit kernel" am: 68454405a4Automerger Merge Worker2020-01-243-2/+24
| |\ \ \ | | |/ / | |/| |
* | | | Merge "Snap for 6198741 from 68454405a48941324f6a7bb21225d3b99d11be43 to sdk-...platform-tools-29.0.6android-build-prod (mdb)2020-02-113-2/+24
|\ \ \ \
| * | | | Snap for 6198741 from 68454405a48941324f6a7bb21225d3b99d11be43 to sdk-releaseandroid-build-prod (mdb)2020-02-113-2/+24
|/| | | | | | |/ / | |/| |
| * | | Merge "ANDROID: Fix 32-bit x86 iproute2 on 64-bit kernel"Maciej Żenczykowski2020-01-243-2/+24
| |\ \ \ | | |/ / | |/| |
| | * | ANDROID: Fix 32-bit x86 iproute2 on 64-bit kernelAlistair Delva2020-01-213-2/+24
| |/ /
| * | Merge "Attempt to run netd tests when iproute2 is modified." am: de0e714027 a...android-mainline-10.0.0_r8android-mainline-10.0.0_r6android10-mainline-resolv-releaseandroid10-mainline-networking-releaseLorenzo Colitti2019-06-131-0/+10
| |\ \ | | |/ | |/|
* | | Merge "Snap for 5925869 from 5765a40a00f9acc3da2e5f4d19de54b4456b071f to sdk-...platform-tools-29.0.5android-build-prod (mdb)2019-10-080-0/+0
|\ \ \
| * | | Snap for 5925869 from 5765a40a00f9acc3da2e5f4d19de54b4456b071f to sdk-releaseandroid-build-prod (mdb)2019-10-080-0/+0
|/| | | | | |/ | |/|
| * | Merge "Attempt to run netd tests when iproute2 is modified." am: de0e714027ndk-sysroot-r21Lorenzo Colitti2019-06-131-0/+10
| |\ \ | | |/ | |/|
| | * Merge "Attempt to run netd tests when iproute2 is modified."Lorenzo Colitti2019-06-131-0/+10
| | |\
| * | \ Merge stage-aosp-master into pi-dev-plus-aospandroid-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-releaseXin Li2019-02-250-0/+0
| |\ \ \
| | * | | Merge stage-aosp-master into pi-dev-plus-aospXin Li2019-02-250-0/+0
| | |\| |
| * | | | Merge "iproute2: remove ek, add satk to OWNERS" am: f3a8012094 am: eecc645a30Maciej Żenczykowski2019-01-281-1/+1
| |\| | |
| | * | | Merge "iproute2: remove ek, add satk to OWNERS" am: f3a8012094Maciej Żenczykowski2019-01-281-1/+1
| | |\ \ \
| * | | | | Merge changes I0af6a8c1,Ia77fd91e,Ib26b3167,Ic6e7afd9,I58752686 am: 90a033c68...Maciej Żenczykowski2019-01-2814-106/+4302
| |\| | | |
| | * | | | Merge changes I0af6a8c1,Ia77fd91e,Ib26b3167,Ic6e7afd9,I58752686 am: 90a033c688Maciej Żenczykowski2019-01-2814-106/+4302
| | |\ \ \ \
| * | | | | | Merge "iproute2: add maze to OWNERS" am: bfde7e0d24 am: 1316271023Maciej Żenczykowski2019-01-281-0/+1
| |\| | | | |
| | * | | | | Merge "iproute2: add maze to OWNERS" am: bfde7e0d24Maciej Żenczykowski2019-01-281-0/+1
| | |\ \ \ \ \
| * | | | | | | Merge "Convert to Android.bp" am: d81c8f2604 am: 5cbed885ddDan Willemsen2018-11-1910-191/+219
| |\| | | | | |
| * | | | | | | [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE...Bill Yi2018-10-240-0/+0
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ [automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ...Bill Yi2018-10-240-0/+0
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge "UPSTREAM: ip-xfrm: Add support for OUTPUT_MARK" am: 4abfdca336 am: 20c...Subash Abhinov Kasiviswanathan2018-06-213-1/+36
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge changes I16e45b38,I150ade94 am: f887894039 am: f72b896afbPavel Maltsev2018-06-075-1/+14
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge "Compile ss(8) with HAVE_SELINUX." am: 2392dac63f am: 19b1cbd944Robert Sesek2018-04-181-2/+3
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ Merge "Snap for 5735642 from de0e714027aab92fe1c1d6e90af8372bd440743b to sdk-...platform-tools-29.0.4platform-tools-29.0.3platform-tools-29.0.2android-build-prod (mdb)2019-07-171-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Snap for 5735642 from de0e714027aab92fe1c1d6e90af8372bd440743b to sdk-releaseandroid-build-prod (mdb)2019-07-171-0/+10
|/| | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge "Attempt to run netd tests when iproute2 is modified."Treehugger Robot2019-06-141-0/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| | * | | | | | | | | | | Attempt to run netd tests when iproute2 is modified.Lorenzo Colitti2019-06-131-0/+10
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge "Snap for 5590969 from 4c65a71809321bd696a1cd81f5f6a2a567a42f59 to sdk-...platform-tools-29.0.1android-build-prod (mdb)2019-05-210-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Snap for 5590969 from 4c65a71809321bd696a1cd81f5f6a2a567a42f59 to sdk-releaseandroid-build-prod (mdb)2019-05-210-0/+0
|/| | | | | | | | | | | | | |/ / / / / / / / / / /
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-14 12:25:34 +0000