aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2020-04-30Add METADATA to scapy: GPL=RESTRICTED am: cc60f6c476android-r-beta-3android-r-beta-2Bob Badour
Change-Id: Ie60b126bc92e2f7c100a65425eef140ea6392cdb
2020-04-29Add METADATA to scapy: GPL=RESTRICTEDBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: Ib796db4d91ee077ddd7195cc7daf7f34a1d8d095
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospr_aml_301500702q_tzdata_aml_297100400q_tzdata_aml_297100300q_tzdata_aml_297100000q_tzdata_aml_296200000q_tzdata_aml_295600118q_tzdata_aml_295600110q_tzdata_aml_295500002q_tzdata_aml_295500001q_tzdata_aml_294400310android-vts-11.0_r9android-vts-11.0_r8android-vts-11.0_r7android-vts-11.0_r6android-vts-11.0_r5android-vts-11.0_r4android-vts-11.0_r3android-vts-11.0_r2android-vts-11.0_r16android-vts-11.0_r15android-vts-11.0_r14android-vts-11.0_r13android-vts-11.0_r12android-vts-11.0_r11android-vts-11.0_r10android-vts-11.0_r1android-security-11.0.0_r76android-security-11.0.0_r75android-security-11.0.0_r74android-security-11.0.0_r73android-security-11.0.0_r72android-security-11.0.0_r71android-security-11.0.0_r70android-security-11.0.0_r69android-security-11.0.0_r68android-security-11.0.0_r67android-security-11.0.0_r66android-security-11.0.0_r65android-security-11.0.0_r64android-security-11.0.0_r63android-security-11.0.0_r62android-security-11.0.0_r61android-security-11.0.0_r60android-security-11.0.0_r59android-security-11.0.0_r58android-security-11.0.0_r57android-security-11.0.0_r56android-security-11.0.0_r55android-security-11.0.0_r54android-security-11.0.0_r53android-security-11.0.0_r52android-security-11.0.0_r51android-security-11.0.0_r50android-security-11.0.0_r49android-security-11.0.0_r1android-r-preview-4android-r-preview-3android-r-preview-2android-r-preview-1android-platform-11.0.0_r9android-platform-11.0.0_r8android-platform-11.0.0_r7android-platform-11.0.0_r6android-platform-11.0.0_r5android-platform-11.0.0_r40android-platform-11.0.0_r4android-platform-11.0.0_r39android-platform-11.0.0_r38android-platform-11.0.0_r37android-platform-11.0.0_r36android-platform-11.0.0_r35android-platform-11.0.0_r34android-platform-11.0.0_r33android-platform-11.0.0_r32android-platform-11.0.0_r31android-platform-11.0.0_r30android-platform-11.0.0_r3android-platform-11.0.0_r29android-platform-11.0.0_r28android-platform-11.0.0_r27android-platform-11.0.0_r26android-platform-11.0.0_r25android-platform-11.0.0_r24android-platform-11.0.0_r23android-platform-11.0.0_r22android-platform-11.0.0_r21android-platform-11.0.0_r20android-platform-11.0.0_r2android-platform-11.0.0_r19android-platform-11.0.0_r18android-platform-11.0.0_r17android-platform-11.0.0_r16android-platform-11.0.0_r15android-platform-11.0.0_r14android-platform-11.0.0_r13android-platform-11.0.0_r12android-platform-11.0.0_r11android-platform-11.0.0_r10android-platform-11.0.0_r1android-mainline-12.0.0_r55android-mainline-12.0.0_r54android-mainline-12.0.0_r111android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r45android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r4android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android-mainline-11.0.0_r10android-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_r13android-mainline-10.0.0_r12android-mainline-10.0.0_r11android-mainline-10.0.0_r10android-cts-11.0_r9android-cts-11.0_r8android-cts-11.0_r7android-cts-11.0_r6android-cts-11.0_r5android-cts-11.0_r4android-cts-11.0_r3android-cts-11.0_r2android-cts-11.0_r16android-cts-11.0_r15android-cts-11.0_r14android-cts-11.0_r13android-cts-11.0_r12android-cts-11.0_r11android-cts-11.0_r10android-cts-11.0_r1android-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r6android-11.0.0_r5android-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r4android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r3android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r25android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r2android-11.0.0_r19android-11.0.0_r18android-11.0.0_r17android-11.0.0_r16android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android-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_r12q_tzdata_aml_297100000ndk-sysroot-r21android12-mainline-tzdata-releaseandroid11-tests-releaseandroid11-security-releaseandroid11-s1-releaseandroid11-releaseandroid11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-platform-releaseandroid11-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-gsiandroid11-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-releaseandroid10-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-releaseandroid10-android13-mainline-tzdata-releaseXin Li
am: 86499fce24 Change-Id: Ifecc841bb720b54260313a810f36140fdbdda6df
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
Bug: 126125118 Change-Id: I5d532981359ca94fe56d99efb86ddd978c276dd5
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
Bug: 120848293 Change-Id: If84002cb9a9545b327c3ee528102ac041b945a22
2019-01-16Add default code reviewers into OWNERS am: b4b5915d62 am: 8c6add1fccChih-Hung Hsieh
am: 128adb6842 Change-Id: Ia3543974564e794250bea497a84ddf13dd868a57
2019-01-16Add default code reviewers into OWNERS am: b4b5915d62Chih-Hung Hsieh
am: 8c6add1fcc Change-Id: Id632dec7b950e5ea8293a0b5055f05066128b8d3
2019-01-16Add default code reviewers into OWNERSChih-Hung Hsieh
am: b4b5915d62 Change-Id: Ie9d1166de314d553330eb4749a74076c8292dc88
2019-01-10Add default code reviewers into OWNERSandroid-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1Chih-Hung Hsieh
Bug: 33166666 Test: gerrit uploader Change-Id: Iaf23cb1888fb1314e23456572fbf501dd7191c82
2018-12-10[automerger skipped] DO NOT MERGE am: 2244bd112c -s ours am: 0de27c555e -s ↵Xin Li
ours am: fc792fb4e4 -s ours Change-Id: Icdaf15c91b16ee8e9b79cc3627f2f1a07bc2cae7
2018-12-10[automerger skipped] DO NOT MERGE am: 2244bd112c -s oursXin Li
am: 0de27c555e -s ours Change-Id: I8bab5ba4461d4a93b7b64e7db39b30bc3c7d620f
2018-12-10[automerger skipped] DO NOT MERGEXin Li
am: 2244bd112c -s ours Change-Id: I1378fc1126b7f77dd96d6ca79265587bbc6008a1
2018-12-07DO NOT MERGEXin Li
Merge pie-platform-release (PPRL.181205.001, history only) into master Bug: 120502534 Change-Id: I91674ef1d53c77f43ceaa7edfb4a7942993a8115
2018-01-29merge 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_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-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_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-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_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-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_r61android-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-releasegitbuildkicker
2018-01-29merge in pi-release history after reset to mastergitbuildkicker
2018-01-29Snap for 4572138 from d6b412cfde0442650d6a05884e822a396702edfd to pi-releaseandroid-build-team Robot
Change-Id: I0cedd13c96f47764e61dc8d8c2f22563d015d548
2018-01-29Android.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 Vo
am: 4eb0f69c7d Change-Id: I0bc871ddacd2970cce6376a1a87c9275588f5d17
2018-01-29Android.bp for scapy. am: 34a73a2c76Tri Vo
am: 3c8aececee Change-Id: I48b166bee7ed7af5cbddbfcdc81b8953b1165891
2018-01-29Android.bp for scapy.Tri Vo
am: 34a73a2c76 Change-Id: Ia991982cdfc3a6332843d025780daea98c46a859
2018-01-24Android.bp for scapy.android-wear-p-preview-2android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-p-preview-1Tri Vo
Bug: 36510518 Change-Id: I518bc983d75161bb7cec6e51b14fc9c8d8d12208
2018-01-24Merge remote-tracking branch 'aosp/upstream-master' am: 7a190cd28b am: ↵Tri Vo
ded265a0e0 am: 3eeee89ed1 Change-Id: I02fc83dce38939c82a0b8a9214d33d93aead2752
2018-01-24Merge remote-tracking branch 'aosp/upstream-master' am: 7a190cd28bTri Vo
am: ded265a0e0 Change-Id: I2e8161a178eb1958f629f16302b69c78efdbcf3d
2018-01-24Merge remote-tracking branch 'aosp/upstream-master'Tri Vo
am: 7a190cd28b Change-Id: I5f1cc3af1be5a4c3b035d830ddc22d02692771ab
2018-01-23Merge remote-tracking branch 'aosp/upstream-master'Tri Vo
Change-Id: I8d3261c64ad25be6429ff7960ce3a90ee58714a1
2018-01-23Initial empty repository(raulenrique)
2018-01-23Merge pull request #1074 from p-l-/fix-bluetooth-constantGuillaume Valadon
Fix bluetooth constant
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-20 23:53:05 +0000