aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add METADATA to scapy: GPL=RESTRICTED am: cc60f6c476 am: 1c94e2d5bbHEADmasterBob Badour2020-04-301-0/+3
|\
| * Add METADATA to scapy: GPL=RESTRICTED am: cc60f6c476android-r-beta-3android-r-beta-2Bob Badour2020-04-301-0/+3
|/|
| * Add METADATA to scapy: GPL=RESTRICTEDBob Badour2020-04-291-0/+3
|/
* Merge stage-aosp-master into pi-dev-plus-aospandroid-vts-11.0_r1android-r-preview-4android-r-preview-3android-r-preview-2android-r-preview-1android-mainline-11.0.0_r1android-mainline-10.0.0_r9android-mainline-10.0.0_r8android-mainline-10.0.0_r7android-mainline-10.0.0_r6android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r11android-mainline-10.0.0_r10android-cts-11.0_r1android-11.0.0_r3android-11.0.0_r2android-11.0.0_r17android-11.0.0_r1android-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_r12ndk-sysroot-r21android11-tests-releaseandroid11-releaseandroid11-mainline-releaseandroid11-gsiandroid11-devandroid10-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-tzdata-releaseandroid10-mainline-resolv-releaseandroid10-mainline-networking-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
| | |\
* | | | Add default code reviewers into OWNERS am: b4b5915d62 am: 8c6add1fccChih-Hung Hsieh2019-01-161-0/+3
|\| | |
| * | | Add default code reviewers into OWNERS am: b4b5915d62Chih-Hung Hsieh2019-01-161-0/+3
| |\| | | | |/ | |/|
| | * Add default code reviewers into OWNERSChih-Hung Hsieh2019-01-161-0/+3
| | |\
| | | * Add default code reviewers into OWNERSandroid-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1Chih-Hung Hsieh2019-01-101-0/+3
* | | | [automerger skipped] DO NOT MERGE am: 2244bd112c -s ours am: 0de27c555e -s ...Xin Li2018-12-100-0/+0
|\| | |
| * | | [automerger skipped] DO NOT MERGE am: 2244bd112c -s oursXin Li2018-12-100-0/+0
|/| | | | |/ /
| * / [automerger skipped] DO NOT MERGEXin Li2018-12-100-0/+0
|/| | | |/
| * DO NOT MERGEXin Li2018-12-070-0/+0
|/|
| * merge in pi-release history after reset to masterandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r3android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-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-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-releasegitbuildkicker2018-01-290-0/+0
| |\
| | * merge in pi-release history after reset to mastergitbuildkicker2018-01-290-0/+0
| | |\ | | |/ | |/|
| * | Snap for 4572138 from d6b412cfde0442650d6a05884e822a396702edfd to pi-releaseandroid-build-team Robot2018-01-291-0/+11
| |\ \ | |/ / |/| / | |/
* | Android.bp for scapy. am: 34a73a2c76 am: 3c8aececeeandroid-wear-8.0.0_r2android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-devmaster-cuttlefish-testing-releaseTri Vo2018-01-291-0/+11
|\ \ | |/ |/|
| * Android.bp for scapy. am: 34a73a2c76Tri Vo2018-01-291-0/+11
| |\
| | * Android.bp for scapy.Tri Vo2018-01-291-0/+11
| | |\
| | | * Android.bp for scapy.android-wear-p-preview-2android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-p-preview-1Tri Vo2018-01-241-0/+11
* | | | Merge remote-tracking branch 'aosp/upstream-master' am: 7a190cd28b am: ded265...Tri Vo2018-01-24347-0/+138795
|\| | |
| * | | Merge remote-tracking branch 'aosp/upstream-master' am: 7a190cd28bTri Vo2018-01-24347-0/+138795
|/| | | | |/ /
| * / Merge remote-tracking branch 'aosp/upstream-master'Tri Vo2018-01-24347-0/+138795
|/| | | |/
| * Merge remote-tracking branch 'aosp/upstream-master'Tri Vo2018-01-23347-0/+138795
|/|
| * Merge pull request #1074 from p-l-/fix-bluetooth-constantGuillaume Valadon2018-01-232-2/+3
| |\
| | * Fix bluetooth constantPierre LALET2018-01-212-2/+3
| * | Merge pull request #1075 from gpotter2/p0f-testsPierre Lalet2018-01-232-8/+71
| |\ \
| | * | Add p0f tests + PY3 fixesgpotter22018-01-222-8/+71
| * | | Merge pull request #1066 from gpotter2/str-callsPierre Lalet2018-01-222-3/+3
| |\ \ \
| | * | | Forgotten str() instead of raw() fixedgpotter22018-01-182-3/+3
| * | | | Merge pull request #1067 from gpotter2/win-static-py3Pierre Lalet2018-01-211-7/+10
| |\ \ \ \
| | * | | | Static access to LOOPBACK_INTERFACEgpotter22018-01-201-7/+10
| | |/ / /
| * | | | Merge pull request #1077 from guedou/coverage_fixPierre Lalet2018-01-212-4/+4
| |\ \ \ \
| | * | | | Fix coverage reportsGuillaume Valadon2018-01-212-4/+4
| * | | | | Merge pull request #1081 from gpotter2/fix-1079Pierre Lalet2018-01-212-4/+78
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Add testgpotter22018-01-211-0/+75
| | * | | | Do not use hardcoded value in _get_metricsgpotter22018-01-211-4/+3
| | |/ / /
| * | | | Merge pull request #1080 from p-l-/fix-1078Guillaume Valadon2018-01-211-1/+2
| |\ \ \ \
| | * | | | Remove unnecessary .split() call (@karpierz)Pierre LALET2018-01-211-1/+2
| | |/ / /
| * | | | Merge pull request #1058 from p-l-/support-canGuillaume Valadon2018-01-214-1/+93
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Early CANopen protocol supportPierre LALET2018-01-163-0/+92
| | * | | Fix typoPierre LALET2018-01-161-1/+1
| * | | | Merge pull request #1057 from guedou/RADIUS_fixesPierre Lalet2018-01-212-56/+31
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Remove cryptography dependency, Python3 support and testsGuillaume Valadon2018-01-162-56/+31
| * | | | Merge pull request #1061 from guedou/nmap_coveragePierre Lalet2018-01-201-0/+8
| |\ \ \ \
| | * | | | NMAP: test more functionsGuillaume Valadon2018-01-171-0/+8
| | | |_|/ | | |/| |
| * | | | Merge pull request #993 from gpotter2/wireshark-cmdPierre Lalet2018-01-202-4/+12
| |\ \ \ \
| | * | | | Scapy TSHARKgpotter22018-01-172-4/+12
| | | |_|/ | | |/| |
| * | | | Merge pull request #1003 from gpotter2/accuracy-logPierre Lalet2018-01-202-15/+20
| |\ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 06:10:01 +0000