aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-07-15[automerger skipped] Empty Merge Android U (ab/10368041) am: 9a735f3390 -s ↵HEADandroid-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29mastermainandroid14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseXin Li
ours am: 1300cc3130 -s ours am: aa9f9c6641 -s ours am: 7cecfe3506 -s ours am skip reason: Merged-In Idfb23a913d22cd572baa1286a6b4d59828adfdd7 with SHA-1 972724dd26 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/scapy/+/24087186 Change-Id: I6bdf36ac738ac78e6b05946fdddbf61a564615dd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-15[automerger skipped] Empty Merge Android U (ab/10368041) am: 9a735f3390 -s ↵Xin Li
ours am: 1300cc3130 -s ours am: aa9f9c6641 -s ours am skip reason: Merged-In Idfb23a913d22cd572baa1286a6b4d59828adfdd7 with SHA-1 972724dd26 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/scapy/+/24087186 Change-Id: Icc31dd0dc974a1a0276e11e1dc5c862b532bf138 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-15[automerger skipped] Empty Merge Android U (ab/10368041) am: 9a735f3390 -s ↵Xin Li
ours am: 1300cc3130 -s ours am skip reason: Merged-In Idfb23a913d22cd572baa1286a6b4d59828adfdd7 with SHA-1 972724dd26 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/scapy/+/24087186 Change-Id: I5c7f9cfb139ee79b190b10af8404a488e82e4d45 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-15[automerger skipped] Empty Merge Android U (ab/10368041) am: 9a735f3390 -s oursXin Li
am skip reason: Merged-In Idfb23a913d22cd572baa1286a6b4d59828adfdd7 with SHA-1 972724dd26 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/scapy/+/24087186 Change-Id: I0b75aa0d5757f07f7ecf775f719f3508cc016982 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14Empty Merge Android U (ab/10368041)Xin Li
Bug: 291102124 Merged-In: Idfb23a913d22cd572baa1286a6b4d59828adfdd7 Change-Id: Iaed4eba1a02d4d7bf6dc56ad588a15bc516b45f0
2023-06-30Edit METADATA file am: f24dc45d29 am: 38548dd07b am: 703abaf06d am: ↵Sadaf Ebrahimi
43e4e11f96 am: 83f3fa9fc8 am: 22071533be Original change: https://android-review.googlesource.com/c/platform/external/scapy/+/2645295 Change-Id: Iabff32c36aeefefd080bb1749b061ad9b5a83ab1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30Edit METADATA file am: f24dc45d29 am: 38548dd07b am: 703abaf06d am: ↵Sadaf Ebrahimi
43e4e11f96 am: 83f3fa9fc8 Original change: https://android-review.googlesource.com/c/platform/external/scapy/+/2645295 Change-Id: Ic590a79d411bee315ca5f4a33354d7decbd8393d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30Edit METADATA file am: f24dc45d29 am: 38548dd07b am: 703abaf06d am: 43e4e11f96Sadaf Ebrahimi
Original change: https://android-review.googlesource.com/c/platform/external/scapy/+/2645295 Change-Id: I39426a14f96ef338c69152dbfccfed51e13edf80 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30Edit METADATA file am: f24dc45d29 am: 38548dd07b am: 703abaf06dSadaf Ebrahimi
Original change: https://android-review.googlesource.com/c/platform/external/scapy/+/2645295 Change-Id: I103cea9d1700ed25dee7fea9143a99b7d745dbf9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29Edit METADATA file am: f24dc45d29 am: 38548dd07bSadaf Ebrahimi
Original change: https://android-review.googlesource.com/c/platform/external/scapy/+/2645295 Change-Id: I3bbec07fcaa0c401b10f7fdc9897bf88fe2fb1a4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29Edit METADATA file am: f24dc45d29Sadaf Ebrahimi
Original change: https://android-review.googlesource.com/c/platform/external/scapy/+/2645295 Change-Id: I085e95ecafdf3410024e959463831d894ff97130 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29Edit METADATA fileSadaf Ebrahimi
Test: TreeHugger Change-Id: Ibba9197511cc4572446ccb054cd47c49bf1f5f88
2023-01-03scapy - disable py2 am: e2a85d4c0e am: 81b842d469 am: d035ca72dcandroid-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_hef_341717050aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_cfg_341510000android14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-mainline-healthfitness-releaseandroid14-devandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releaseMaciej Żenczykowski
Original change: https://android-review.googlesource.com/c/platform/external/scapy/+/2369288 Change-Id: Idfb23a913d22cd572baa1286a6b4d59828adfdd7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-03scapy - disable py2 am: e2a85d4c0e am: 81b842d469android-u-beta-1-gplMaciej Żenczykowski
Original change: https://android-review.googlesource.com/c/platform/external/scapy/+/2369288 Change-Id: I642ab48e6de1676761b9f2e8f064c391524dc869 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-03scapy - disable py2 am: e2a85d4c0eMaciej Żenczykowski
Original change: https://android-review.googlesource.com/c/platform/external/scapy/+/2369288 Change-Id: I89778880c9773fe2c1b1855edb1a14ba0d62ff80 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-23scapy - disable py2main-16k-with-phonesMaciej Żenczykowski
kernel net tests now uses py3 Test: TreeHugger Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I47fa2b69e3e6f0769425cc9b37984c435b4fbdbb
2022-08-17[automerger skipped] DO NOT MERGE - Merge Android 13 am: 9367303a2d -s ours ↵Xin Li
am: 561d0535eb -s ours am: 530c8ab901 -s ours am: ce62e92220 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/scapy/+/2186762 Change-Id: Ib24c119f6c32ec83d0f998aa9b27e54736e3b1cf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17[automerger skipped] DO NOT MERGE - Merge Android 13 am: 9367303a2d -s ours ↵Xin Li
am: 561d0535eb -s ours am: 530c8ab901 -s ours am skip reason: Merged-In Ifb26b6c6e5183dc7ef60ea34161a1b44a15477bb with SHA-1 d901e7fb8c is already in history Original change: https://android-review.googlesource.com/c/platform/external/scapy/+/2186762 Change-Id: Idd3d015f72f0908a3ebee01cc2e3f4b8b7a82361 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17[automerger skipped] DO NOT MERGE - Merge Android 13 am: 9367303a2d -s ours ↵Xin Li
am: 561d0535eb -s ours am skip reason: Merged-In Ifb26b6c6e5183dc7ef60ea34161a1b44a15477bb with SHA-1 d901e7fb8c is already in history Original change: https://android-review.googlesource.com/c/platform/external/scapy/+/2186762 Change-Id: I895092a4f9a26c074787ad8a2b660b42c4528399 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16[automerger skipped] DO NOT MERGE - Merge Android 13 am: 9367303a2d -s oursXin Li
am skip reason: Merged-In Ifb26b6c6e5183dc7ef60ea34161a1b44a15477bb with SHA-1 d901e7fb8c is already in history Original change: https://android-review.googlesource.com/c/platform/external/scapy/+/2186762 Change-Id: I878b0850fa16130870d3c3f3d9d6d0a4fa2d611d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-15DO NOT MERGE - Merge Android 13main-16kXin Li
Bug: 242648940 Merged-In: Ifb26b6c6e5183dc7ef60ea34161a1b44a15477bb Change-Id: I4492b9d920e7902a6e65b4fac335d6ba6877b265
2022-06-30[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: ↵Xin Li
2bc12ef108 -s ours am: c16166ef3b -s ours am: e20a125ce2 -s ours am: 9ea3e50fae -s ours am skip reason: Merged-In Ifb26b6c6e5183dc7ef60ea34161a1b44a15477bb with SHA-1 d901e7fb8c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/scapy/+/19093155 Change-Id: Id2d6e661be643c34bd63e38636d5cce7856e14e9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: ↵Xin Li
2bc12ef108 -s ours am: c16166ef3b -s ours am: e20a125ce2 -s ours am skip reason: Merged-In Ifb26b6c6e5183dc7ef60ea34161a1b44a15477bb with SHA-1 d901e7fb8c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/scapy/+/19093155 Change-Id: I216b9b7403b7099c2341b2bad521bacd30299d71 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: ↵Xin Li
2bc12ef108 -s ours am: c16166ef3b -s ours am skip reason: Merged-In Ifb26b6c6e5183dc7ef60ea34161a1b44a15477bb with SHA-1 d901e7fb8c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/scapy/+/19093155 Change-Id: I8032cfa893e65219179a55751fa8d47130c9a1ee Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: ↵Xin Li
2bc12ef108 -s ours am skip reason: Merged-In Ifb26b6c6e5183dc7ef60ea34161a1b44a15477bb with SHA-1 d901e7fb8c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/scapy/+/19093155 Change-Id: I6538a96af7592b44e7c9561772664b59d3b00073 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-27Merge tm-dev-plus-aosp-without-vendor@8763363temp_sam_242648940Xin Li
Bug: 236760014 Merged-In: Ifb26b6c6e5183dc7ef60ea34161a1b44a15477bb Change-Id: I60786fe67b1ee7d33e873eaea2840e4de2cffaef
2021-05-27Merge sc-mainline-prod to master.t_frc_odp_330442040t_frc_odp_330442000t_frc_con_330443020t_frc_cbr_330443000t_frc_ase_330444010t_frc_art_330443060t_frc_adb_330444000android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r55android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android-13.0.0_r30android-13.0.0_r29android-13.0.0_r28android-13.0.0_r27android-13.0.0_r24android-13.0.0_r23android-13.0.0_r22android-13.0.0_r21android-13.0.0_r20android-13.0.0_r19android-13.0.0_r18android-13.0.0_r17android-13.0.0_r16aml_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_go_wif_330911000aml_go_uwb_330912000aml_go_tz4_330912000aml_go_tet_330914010aml_go_swc_330913000aml_go_sta_330911000aml_go_sdk_330810000aml_go_sch_330911000aml_go_res_330912000aml_go_per_330912000aml_go_odp_330913000aml_go_odp_330912000aml_go_neu_330912000aml_go_net_330913000aml_go_mpr_330912000aml_go_ase_330913000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000aml_go_adb_330913000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-qpr1-s8-releaseandroid13-qpr1-s7-releaseandroid13-qpr1-s6-releaseandroid13-qpr1-s5-releaseandroid13-qpr1-s4-releaseandroid13-qpr1-s3-releaseandroid13-qpr1-s2-releaseandroid13-qpr1-s1-releaseandroid13-qpr1-releaseandroid13-mainline-uwb-releaseandroid13-mainline-tzdata4-releaseandroid13-mainline-go-wifi-releaseandroid13-mainline-go-uwb-releaseandroid13-mainline-go-tzdata4-releaseandroid13-mainline-go-tethering-releaseandroid13-mainline-go-sdkext-releaseandroid13-mainline-go-scheduling-releaseandroid13-mainline-go-resolv-releaseandroid13-mainline-go-permission-releaseandroid13-mainline-go-os-statsd-releaseandroid13-mainline-go-odp-releaseandroid13-mainline-go-neuralnetworks-releaseandroid13-mainline-go-networking-releaseandroid13-mainline-go-mediaprovider-releaseandroid13-mainline-go-media-swcodec-releaseandroid13-mainline-go-appsearch-releaseandroid13-mainline-go-adservices-releaseandroid13-mainline-go-adbd-releaseandroid13-mainline-appsearch-releaseandroid13-mainline-adservices-releaseandroid13-frc-odp-releaseandroid13-frc-conscrypt-releaseandroid13-frc-cellbroadcast-releaseandroid13-frc-art-releaseandroid13-frc-adbd-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-releaseaml_tz4_332714010Bill Rassieur
Change-Id: Ifa77184ec091679292b6254aae622e59fbddff4a
2021-03-04resolve merge conflicts of 8b8bff811148d1b0812f8ea63d1571c3bb48b719 to masterSam Saccone
Change-Id: Ifa6d484ce66a3fd62f0ec38975b3805036ddac7b
2021-03-04fix broken include in aosp-master OWNERS in scapy project am: d901e7fb8c am: ↵android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-releaseAlly Sillins
ef01b41d97 am: 6d4c24db34 am: 8b8bff8111 Original change: https://android-review.googlesource.com/c/platform/external/scapy/+/1615394 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7c1b9a599e6c820a29137fd6e9205f3b7dd77e13
2021-03-04fix broken include in aosp-master OWNERS in scapy project am: d901e7fb8c am: ↵android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-3android-s-v2-beta-2android-s-qpr3-beta-1android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid12--mainline-releaseandroid-t-preview-1android-s-v2-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Ally Sillins
ef01b41d97 am: 6d4c24db34 Original change: https://android-review.googlesource.com/c/platform/external/scapy/+/1615394 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I66c864686e18d91c534090c6c5736f1f26e01031
2021-03-04fix broken include in aosp-master OWNERS in scapy project am: d901e7fb8c am: ↵Ally Sillins
ef01b41d97 Original change: https://android-review.googlesource.com/c/platform/external/scapy/+/1615394 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If317bf3cc0466c7edcad9d5f931d3a7f7e5b8b39
2021-03-03fix broken include in aosp-master OWNERS in scapy project am: d901e7fb8candroid-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4Ally Sillins
Original change: https://android-review.googlesource.com/c/platform/external/scapy/+/1615394 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4fc04aa3c99bd33983c193009c974ab18224698c
2021-03-03fix broken include in aosp-master OWNERS in scapy projectandroid-s-beta-2android-s-beta-1Ally Sillins
Change-Id: Ifb26b6c6e5183dc7ef60ea34161a1b44a15477bb Bug: 181804575
2021-03-01Fix OWNERS include lineSam Saccone
go/android-codereviews#include-a-nested-owners-file-from-another-git-project BUG=181581205 FIXED=181581205 Change-Id: Iddd271fba5fd53055c84d1ecd405304f5c7146bf
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to external/scapy am: 17bfc66ac1 am: ↵Bob Badour
40aa18d91e am: dc4c3622ce am: 3a3324cd5c Original change: https://android-review.googlesource.com/c/platform/external/scapy/+/1575938 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia5439f43a006c2c69f7baf6aea25e925d4abc14f
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to external/scapy am: 17bfc66ac1 am: ↵Bob Badour
40aa18d91e am: dc4c3622ce am: 3a3324cd5c Original change: https://android-review.googlesource.com/c/platform/external/scapy/+/1575938 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I159cb2829f1bdf0b9f0c84e9a0d14cd06b4b15cb
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to external/scapy am: 17bfc66ac1 am: ↵Bob Badour
40aa18d91e am: dc4c3622ce Original change: https://android-review.googlesource.com/c/platform/external/scapy/+/1575938 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I83ceba781395d0f3a8e7dfbd2ce0a9f1804f13c9
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to external/scapy am: 17bfc66ac1 am: 40aa18d91eBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/scapy/+/1575938 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I90a02cfa8b36f2710d1f79be4b2663f028742e59
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to external/scapy am: 17bfc66ac1Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/scapy/+/1575938 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I66da9d239899c4abc3ee5fadf3f11cbe6264e9ec
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to external/scapyandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-GPL SPDX-license-identifier-GPL-2.0 SPDX-license-identifier-GPL-3.0 SPDX-license-identifier-LGPL SPDX-license-identifier-MIT to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I40c16da3943cfb690d78b47c23943ff8c2734589
2021-02-03Remove documentation and refresh OWNERS am: 6b87d6e6cf am: 55cb073b54 am: ↵Bob Badour
b33bef727e am: 69b3a6d350 Original change: https://android-review.googlesource.com/c/platform/external/scapy/+/1556650 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iac904d2083ffc08ce0b43d571a704f7779173eec
2021-02-03Remove documentation and refresh OWNERS am: 6b87d6e6cf am: 55cb073b54 am: ↵Bob Badour
b33bef727e am: 69b3a6d350 Original change: https://android-review.googlesource.com/c/platform/external/scapy/+/1556650 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie736fe65508b48682aeb5140addc4a9583d7ef59
2021-02-02Remove documentation and refresh OWNERS am: 6b87d6e6cf am: 55cb073b54 am: ↵Bob Badour
b33bef727e Original change: https://android-review.googlesource.com/c/platform/external/scapy/+/1556650 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I15414368739642a3cebcab7e18440a5be9e98c53
2021-02-02Remove documentation and refresh OWNERS am: 6b87d6e6cf am: 55cb073b54Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/scapy/+/1556650 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ibd59147fdc98984dc14f7ebea609c5ea0023e909
2021-02-02Remove documentation and refresh OWNERS am: 6b87d6e6cfBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/scapy/+/1556650 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7fbda1defc19bcfaa029b034d36147bec50a5ba2
2021-02-02Remove documentation and refresh OWNERSBob Badour
Test: m all Change-Id: Ice46dc750b9834d3a9e417c640c61180417ee1ea
2020-04-30Add METADATA to scapy: GPL=RESTRICTED am: cc60f6c476 am: 1c94e2d5bb am: ↵Bob Badour
4feab1f174 am: 9985cb2637 am: f2136e8570 Change-Id: I7a186c8aa37c105e968bf9c04ae4dd0a2d6c9d01
2020-04-30Add METADATA to scapy: GPL=RESTRICTED am: cc60f6c476 am: 1c94e2d5bb am: ↵Bob Badour
4feab1f174 am: 9985cb2637 Change-Id: Ib1187a6b8b4ff26b277100bd2c91197005e01d14
2020-04-30Add METADATA to scapy: GPL=RESTRICTED am: cc60f6c476 am: 1c94e2d5bb am: ↵Bob Badour
4feab1f174 Change-Id: Id95db52d81f4ba4733ca26fdf16b9aa6569eec52
2020-04-30Add METADATA to scapy: GPL=RESTRICTED am: cc60f6c476 am: 1c94e2d5bbBob Badour
Change-Id: I998d837ad0180c3bb46ded5e3d3d6cf27abde073
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 15:05:26 +0000