aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\
| | * DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li2019-02-200-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 "iproute2: remove ek, add satk to OWNERS"Maciej Żenczykowski2019-01-281-1/+1
| | |\ \
| | | * \ Merge "iproute2: remove ek, add satk to OWNERS"Treehugger Robot2019-01-281-1/+1
| | | |\ \
| | | | * | iproute2: remove ek, add satk to OWNERSMaciej Ż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 changes I0af6a8c1,Ia77fd91e,Ib26b3167,Ic6e7afd9,I58752686Maciej Żenczykowski2019-01-2814-106/+4302
| | |\| |
| | | * | Merge changes I0af6a8c1,Ia77fd91e,Ib26b3167,Ic6e7afd9,I58752686Maciej Żenczykowski2019-01-2814-106/+4302
| | | |\ \
| | | | * | iproute2: static compile.Maciej Żenczykowski2019-01-2511-48/+4302
| | | | * | iproute2: support more qdiscsMaciej Żenczykowski2019-01-251-18/+0
| | | | * | iproute2: support filters besides u32Maciej Żenczykowski2019-01-251-9/+0
| | | | * | iproute2: support actions besides mirredMaciej Żenczykowski2019-01-251-11/+0
| | | | * | iproute2: re-enable batchingMaciej Żenczykowski2019-01-252-20/+0
* | | | | | 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 "iproute2: add maze to OWNERS"Maciej Żenczykowski2019-01-271-0/+1
| | |\| |
| | | * | Merge "iproute2: add maze to OWNERS"Maciej Żenczykowski2019-01-281-0/+1
| | | |\|
| | | | * iproute2: add maze to OWNERSMaciej Żenczykowski2019-01-251-0/+1
| | | |/
* | | | Merge "Convert to Android.bp" am: d81c8f2604 am: 5cbed885ddDan Willemsen2018-11-1910-191/+219
|\| | |
| * | | Merge "Convert to Android.bp" am: d81c8f2604Dan Willemsen2018-11-1910-191/+219
| |\| |
| | * | Merge "Convert to Android.bp"Dan Willemsen2018-11-1910-191/+219
| | |\|
| | | * Merge "Convert to Android.bp"Dan Willemsen2018-11-2010-191/+219
| | | |\
| | | | * Convert to Android.bpDan Willemsen2018-11-1810-191/+219
| | | |/
* | | | [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE...Bill Yi2018-10-240-0/+0
|\| | |
| * | | [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE...Bill Yi2018-10-240-0/+0
| |\| |
| | * | [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi2018-10-240-0/+0
| | |\|
| | | * Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi2018-10-240-0/+0
| | | |\
* | | | | [automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ...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 pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi2018-10-240-0/+0
| |/| | | | |/
| | * Snap for 4468711 from 2d868b48b2f313deb4853e8ac5047d05132969c5 to pi-releaseandroid-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-p-preview-5android-p-preview-4android-p-preview-1android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r2android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-platform-releasepie-gsipie-cuttlefish-testingpie-cts-releasepie-arcp-preview-1android-build-team Robot2017-11-26465-14645/+42033
| | |\
* | | | Merge "UPSTREAM: ip-xfrm: Add support for OUTPUT_MARK" am: 4abfdca336 am: 20c...Subash Abhinov Kasiviswanathan2018-06-213-1/+36
|\| | |
| * | | Merge "UPSTREAM: ip-xfrm: Add support for OUTPUT_MARK" am: 4abfdca336Subash Abhinov Kasiviswanathan2018-06-213-1/+36
| |\ \ \
| | * | | Merge "UPSTREAM: ip-xfrm: Add support for OUTPUT_MARK"master-cuttlefish-testing-releaseSubash Abhinov Kasiviswanathan2018-06-213-1/+36
| |/| | |
| | * | | Merge "UPSTREAM: ip-xfrm: Add support for OUTPUT_MARK"Treehugger Robot2018-06-213-1/+36
| | |\ \ \
| | | * | | UPSTREAM: ip-xfrm: Add support for OUTPUT_MARKSubash Abhinov Kasiviswanathan2018-06-203-1/+36
| | |/ / /
* | | | | Merge changes I16e45b38,I150ade94 am: f887894039 am: f72b896afbPavel Maltsev2018-06-075-1/+14
|\| | | |
| * | | | Merge changes I16e45b38,I150ade94 am: f887894039Pavel Maltsev2018-06-075-1/+14
| |\ \ \ \
| | * | | | Merge changes I16e45b38,I150ade94Pavel Maltsev2018-06-075-1/+14
| |/| | | | | | |/ / /
| | * | | Merge changes I16e45b38,I150ade94Treehugger Robot2018-06-075-1/+14
| | |\ \ \
| | | * | | Allow to configure NETNS_RUN_DIR through .mk filesPavel Maltsev2018-06-063-0/+4
| | | * | | Allow to configure /var/run/netns directoryPavel Maltsev2018-06-062-1/+10
| | |/ / /
* | | | / Merge "Compile ss(8) with HAVE_SELINUX." am: 2392dac63f am: 19b1cbd944Robert Sesek2018-04-181-2/+3
|\| | | | | |_|_|/ |/| | |
| * | | Merge "Compile ss(8) with HAVE_SELINUX." am: 2392dac63fRobert Sesek2018-04-181-2/+3
|/| | |
| * | | Merge "Compile ss(8) with HAVE_SELINUX."Robert Sesek2018-04-181-2/+3
| |\| |
| | * | Merge "Compile ss(8) with HAVE_SELINUX."android-wear-p-preview-2Treehugger Robot2018-04-191-2/+3
| |/| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 02:51:39 +0000