summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-11-08[automerger skipped] Merge "Fix include path for system/bt" am: 41aa18c779 ↵HEADt_frc_tz4_330443010t_frc_swc_330443040t_frc_swc_330443010t_frc_sta_330443010t_frc_sch_330443040t_frc_sch_330443010t_frc_res_330443000t_frc_per_330444010t_frc_odp_330442040t_frc_odp_330442000t_frc_neu_330443030t_frc_neu_330443000t_frc_net_330443000t_frc_med_330443030t_frc_ips_330443010t_frc_ext_330443000t_frc_doc_330543000t_frc_doc_330443060t_frc_doc_330443000t_frc_con_330443020t_frc_cbr_330443000t_frc_ase_330444010t_frc_art_330443060t_frc_adb_330444000frc_340821000frc_340819280frc_340819220frc_340819190frc_340819030frc_340819020frc_340819010frc_340818170frc_340818110android-vts-14.0_r3android-vts-14.0_r2android-vts-14.0_r1android-u-beta-1-gplandroid-security-14.0.0_r7android-security-14.0.0_r6android-security-14.0.0_r5android-security-14.0.0_r4android-security-14.0.0_r3android-security-14.0.0_r2android-security-14.0.0_r1android-platform-14.0.0_r6android-platform-14.0.0_r5android-platform-14.0.0_r4android-platform-14.0.0_r3android-platform-14.0.0_r2android-platform-14.0.0_r1android-cts-14.0_r3android-cts-14.0_r2android-cts-14.0_r1android-14.0.0_r9android-14.0.0_r8android-14.0.0_r7android-14.0.0_r6android-14.0.0_r5android-14.0.0_r4android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r3android-14.0.0_r29android-14.0.0_r28android-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_r2android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android-14.0.0_r15android-14.0.0_r14android-14.0.0_r13android-14.0.0_r12android-14.0.0_r11android-14.0.0_r10android-14.0.0_r1android-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_341513070aml_uwb_341511050aml_uwb_341310300aml_uwb_341310030aml_uwb_341111010aml_uwb_341011000aml_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz5_341510070aml_tz5_341510050aml_tz5_341510010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_sch_341510000aml_sch_331113000aml_sch_331111000aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_odp_341610000aml_net_341610030aml_net_341510050aml_net_341510000aml_net_341411030aml_net_341311010aml_net_341310020aml_net_341014000aml_net_340913000aml_net_331910030aml_net_331812010aml_net_331710000aml_net_331610000aml_net_331412000aml_net_331313030aml_net_331313010aml_net_331110020aml_net_331011030aml_net_330910010aml_net_330811010aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_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_med_330913000aml_go_ips_330911000aml_go_ext_330912000aml_go_doc_330912000aml_go_con_330913000aml_go_cbr_330912000aml_go_ase_330913000aml_go_art_330913000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000aml_go_adb_330913000aml_cfg_341510000aml_ase_341510000aml_ase_341410000aml_ase_341310010aml_ase_341113000aml_ase_340913000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_art_341615020aml_art_341514450aml_art_341514410aml_art_341411300aml_art_341311100aml_art_341110110aml_art_341110060aml_art_341010050aml_art_340915060aml_art_331813100aml_art_331813010aml_art_331711080aml_art_331612010aml_art_331413030aml_art_331314010aml_art_331113000aml_art_331012050aml_ads_341615050aml_ads_341517040aml_ads_341413000aml_ads_341316030aml_ads_341131050aml_ads_341027030aml_ads_340915050aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000mastermain-16k-with-phonesmain-16kmainandroid14-tests-releaseandroid14-security-releaseandroid14-s2-releaseandroid14-s1-releaseandroid14-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseandroid14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-platform-releaseandroid14-mainline-uwb-releaseandroid14-mainline-networking-releaseandroid14-mainline-healthfitness-releaseandroid14-mainline-art-releaseandroid14-mainline-appsearch-releaseandroid14-mainline-adservices-releaseandroid14-gsiandroid14-devandroid14-d1-s7-releaseandroid14-d1-s6-releaseandroid14-d1-s5-releaseandroid14-d1-s4-releaseandroid14-d1-s3-releaseandroid14-d1-s2-releaseandroid14-d1-s1-releaseandroid14-d1-releaseandroid13-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-scheduling-releaseandroid13-mainline-networking-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-media-releaseandroid13-mainline-go-ipsec-releaseandroid13-mainline-go-extservices-releaseandroid13-mainline-go-documentsui-releaseandroid13-mainline-go-conscrypt-releaseandroid13-mainline-go-cellbroadcast-releaseandroid13-mainline-go-art-releaseandroid13-mainline-go-appsearch-releaseandroid13-mainline-go-adservices-releaseandroid13-mainline-go-adbd-releaseandroid13-mainline-art-releaseandroid13-mainline-appsearch-releaseandroid13-mainline-adservices-releaseandroid13-frc-scheduling-releaseandroid13-frc-resolv-releaseandroid13-frc-permission-releaseandroid13-frc-os-statsd-releaseandroid13-frc-odp-releaseandroid13-frc-neuralnetworks-releaseandroid13-frc-networking-releaseandroid13-frc-media-swcodec-releaseandroid13-frc-media-releaseandroid13-frc-ipsec-releaseandroid13-frc-extservices-releaseandroid13-frc-documentsui-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_tz5_341510010aml_tz4_332714010Baligh Uddin
am: ee4c6b0a8a -s ours am: e5e16a4e42 -s ours am: 273ebe7be1 -s ours am: 4d4e1523a2 -s ours am skip reason: Merged-In Iba40982fbc388e5f8afb147a247400d02b169b0d with SHA-1 40c33b4e0c is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/bt/+/1883512 Change-Id: I750fc6a60fc35ffd9d4e4460fdf47485dd7bf348
2021-11-08[automerger skipped] Fix include path for system/bt am: 40c33b4e0c am: ↵Baligh Uddin
6f9ca95892 am: c0d4d954af -s ours am skip reason: Merged-In I9e52ba532ae1444190cbf18103fa4e1b0f76d1b2 with SHA-1 5cb844a1ac is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/bt/+/16202300 Change-Id: I1087f077fe91203cb642aa9748ee44a4df3227b6
2021-11-06[automerger skipped] Merge "Fix include path for system/bt" am: 41aa18c779 ↵Baligh Uddin
am: ee4c6b0a8a -s ours am: e5e16a4e42 -s ours am: 273ebe7be1 -s ours am skip reason: Merged-In Iba40982fbc388e5f8afb147a247400d02b169b0d with SHA-1 40c33b4e0c is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/bt/+/1883512 Change-Id: I69b5cf70e45ce5622d948a0d8718d8ea966a25b7
2021-11-06[automerger skipped] Merge "Fix include path for system/bt" am: 41aa18c779 ↵Baligh Uddin
am: ee4c6b0a8a -s ours am: e5e16a4e42 -s ours am skip reason: Merged-In Iba40982fbc388e5f8afb147a247400d02b169b0d with SHA-1 40c33b4e0c is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/bt/+/1883512 Change-Id: I86aa95f7703b1b338e930bcb6feb4d6759e48a9a
2021-11-06[automerger skipped] Merge "Fix include path for system/bt" am: 41aa18c779 ↵Baligh Uddin
am: ee4c6b0a8a -s ours am skip reason: Merged-In Iba40982fbc388e5f8afb147a247400d02b169b0d with SHA-1 40c33b4e0c is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/bt/+/1883512 Change-Id: If2f7364b39259d8afdabcfe48fc4150277406357
2021-11-06Merge "Fix include path for system/bt" am: 41aa18c779android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Baligh Uddin
Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/bt/+/1883512 Change-Id: Iff31c0cb8ddbba75ab3b7746da7d0aa06707c814
2021-11-06Merge "Fix include path for system/bt"Baligh Uddin
2021-11-06Fix include path for system/btBaligh Uddin
BUG: 196026708 Test: TH Merged-In: Iba40982fbc388e5f8afb147a247400d02b169b0d Merged-In: I9e52ba532ae1444190cbf18103fa4e1b0f76d1b2 Change-Id: Ic2324edb34497ae658b7abba3a51c9bb6705ecd6
2021-11-06Fix include path for system/bt am: 40c33b4e0c am: 6f9ca95892Baligh Uddin
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/bt/+/16202300 Change-Id: I1d900a9b2b53976ea1e0edd03d4c9f203ac5967a
2021-11-06Fix include path for system/bt am: 40c33b4e0cBaligh Uddin
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/bt/+/16202300 Change-Id: Icd7da440bc10888c2720ea3d92fdbd0910c4bc1e
2021-11-06Fix include path for system/btBaligh Uddin
BUG: 196026708 Test: TH Merged-In: I9e52ba532ae1444190cbf18103fa4e1b0f76d1b2 Change-Id: Iba40982fbc388e5f8afb147a247400d02b169b0d
2021-11-06Merge "Replace is-vendor-board-platform with is-vendor-board-qcom." am: ↵Treehugger Robot
88f21b8e1c am: 54fcaa9259 am: fef3293bca am: 54ce7a8aa1 am: 20a388f29e Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/bt/+/1866353 Change-Id: Ic7ff6d9ddd23f4945386ee2f0758992a107f7c82
2021-11-05Merge "Replace is-vendor-board-platform with is-vendor-board-qcom." am: ↵Treehugger Robot
88f21b8e1c am: 54fcaa9259 am: fef3293bca am: 54ce7a8aa1 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/bt/+/1866353 Change-Id: Iba693c1765f0ef385cc252fa9fbf32d96d332c81
2021-11-05Merge "Replace is-vendor-board-platform with is-vendor-board-qcom." am: ↵Treehugger Robot
88f21b8e1c am: 54fcaa9259 am: fef3293bca Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/bt/+/1866353 Change-Id: Ifee841504226ed58300d7db1bfc84f54f8b1e262
2021-11-05Merge "Replace is-vendor-board-platform with is-vendor-board-qcom." am: ↵Treehugger Robot
88f21b8e1c am: 54fcaa9259 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/bt/+/1866353 Change-Id: If801b954ff05cb6c3130f191afe2c73c3c9fa0f5
2021-11-05Merge "Replace is-vendor-board-platform with is-vendor-board-qcom." am: ↵Treehugger Robot
88f21b8e1c Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/bt/+/1866353 Change-Id: I4060d80f3c094d5565d056d676498c241537e66f
2021-11-05Merge "Replace is-vendor-board-platform with is-vendor-board-qcom."Treehugger Robot
2021-10-20Replace is-vendor-board-platform with is-vendor-board-qcom.Sasha Smundak
Bug: 201477826 Test: treehugger This change has been generated by the following script: ``` #! /bin/bash declare -r files="$(grep -rlP '^[^#]*call +is-vendor-board-platform' --include '*.mk')" [[ -z "$files" ]] || sed -i -r -f <(cat <<"EOF" s/ifeq \(\$\(call is-vendor-board-platform,QCOM\),true\)/ifneq (,$(call is-vendor-board-qcom))/ s/ifneq \(\$\(call is-vendor-board-platform,QCOM\),true\)/ifeq (,$(call is-vendor-board-qcom))/ EOF ) $files ``` Change-Id: Icf36f2b3df82619064a248985b5970dbd0b29009
2021-10-21Fix include path for system/btBaligh Uddin
BUG: 196026708 Test: TH Change-Id: I9e52ba532ae1444190cbf18103fa4e1b0f76d1b2
2021-02-05Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/bt" am: cad29fea63 am: ↵Bob Badour
00bfb074de am: 4d5a1a5283 am: 6153db47ae Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/bt/+/1576085 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8b8a391dc7f4abe8680f0fb501fd3e78a93f6b26
2021-02-05Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/bt" am: cad29fea63 am: ↵android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-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-devandroid-s-v2-preview-1Bob Badour
00bfb074de am: 4d5a1a5283 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/bt/+/1576085 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3f6cbf936016cf379396c9f13d27ae9c231cc3db
2021-02-05Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/bt" am: cad29fea63 am: ↵Bob Badour
00bfb074de Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/bt/+/1576085 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I731f3cfbfa49d7e45eaf170785a592a816ad2c56
2021-02-05Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/bt" am: cad29fea63android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Bob Badour
Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/bt/+/1576085 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id5a13209d000d1e1aefb2881b1104eeb481cc47a
2021-02-05Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/bt"android-s-preview-1Bob Badour
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/btBob Badour
Added SPDX-license-identifier-Apache-2.0 to: msm8960/libbt-vendor/Android.mk Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD legacy_not_a_contribution to: msm8909/libbt-vendor/Android.mk msm8909w_3100/libbt-vendor/Android.mk msm8992/libbt-vendor/Android.mk msm8996/libbt-vendor/Android.mk msm8998/libbt-vendor/Android.mk Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Ib07f49be6e284639ced42e175babc653e5c33c26
2020-05-04Merge "Add METADATA to bt: Apache2+BSD=NOTICE" am: 2e696fca99 am: 42cbe7d5ea ↵Treehugger Robot
am: 0507127361 am: 0e56ed54cd am: 51367c5406 Change-Id: I32149b982ea8cb0bd1c2d710e54aa566580ef2f4
2020-05-04Merge "Add METADATA to bt: Apache2+BSD=NOTICE" am: 2e696fca99 am: 42cbe7d5ea ↵Treehugger Robot
am: 0507127361 am: 0e56ed54cd Change-Id: I91ab071db6f2b386c6c6c7c9f5329be6e3a8b8e2
2020-05-04Merge "Add METADATA to bt: Apache2+BSD=NOTICE" am: 2e696fca99 am: 42cbe7d5ea ↵Treehugger Robot
am: 0507127361 Change-Id: Ia5ef64241ca9e37c7c73d0dcfffa3b5a99e1ea50
2020-05-04Merge "Add METADATA to bt: Apache2+BSD=NOTICE" am: 2e696fca99 am: 42cbe7d5eaTreehugger Robot
Change-Id: I8ae258fdc79775211adf38b9aeb83d7a955151a3
2020-05-04Merge "Add METADATA to bt: Apache2+BSD=NOTICE" am: 2e696fca99android-r-beta-3android-r-beta-2Treehugger Robot
Change-Id: I3996b3000935bf0ce18dbe1a3c9f2fd1f5107b52
2020-05-04Merge "Add METADATA to bt: Apache2+BSD=NOTICE"Treehugger Robot
2020-05-01Add METADATA to bt: Apache2+BSD=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I3566cd697efb21b4526476254e72c3c6ea627df8
2019-10-30[automerger skipped] DO NOT MERGE - ↵r_aml_301500702android-mainline-12.0.0_r55android-mainline-12.0.0_r112android-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-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-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_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_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android-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_r10aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-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-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-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-releaseaml_tz2_305400100Xin Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 78bcfe5b90 am: 60cd73f453 -s ours am skip reason: subject contains skip directive Change-Id: Iefabd0b03ca12797cce14875a90ade3bde0b3398
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-4android-r-preview-3android-r-preview-2Xin Li
stage-aosp-master am: 78bcfe5b90 Change-Id: I798984ff3aa4bae44643f42416009bfcc9931bfd
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-1Xin Li
stage-aosp-master Bug: 142003500 Change-Id: I683c461dc40d0a3c9dde64d8abb2ab0591a9fba9
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 2ddd0fcff0 -s ours am: 868acf3ead -s ours am: 6be6d32a1e -s ours am skip reason: change_id I3d98bd70a659cad37d520fb0e7ecd631f622e8fb with SHA1 e56141599a is in history Change-Id: I1d5aed1bba431562bfeb76b8113595b68d43f97c
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 2ddd0fcff0 -s ours am: 868acf3ead -s ours am skip reason: change_id I3d98bd70a659cad37d520fb0e7ecd631f622e8fb with SHA1 e56141599a is in history Change-Id: Idec32f127ab8f7c2fd3a56cd25769a771364471c
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 2ddd0fcff0 -s ours am skip reason: change_id I3d98bd70a659cad37d520fb0e7ecd631f622e8fb with SHA1 e56141599a is in history Change-Id: Ib5d319e0a34f6ade941e4077f702b065fe338d3d
2019-09-08Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li
No content change. Bug: 135460123 Change-Id: I1dfed5105490d27692d9db5e0217c29f91c30728 Merged-In: I3d98bd70a659cad37d520fb0e7ecd631f622e8fb
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
cdd572677e -s ours am: c4f1af81bb am: f3f950ee1e am: 98487c8d25 -s ours am skip reason: subject contains skip directive Change-Id: I36ce39f65a2d5552e30a8b03867991dc633ad431
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
cdd572677e -s ours am: c4f1af81bb am: f3f950ee1e Change-Id: I8ba268322af8e9dd55fe3dfa56cae80fc55be04c
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
cdd572677e -s ours am: c4f1af81bb Change-Id: Iddad152bb26595f3cf077cc0ad7b17a0bcee4196
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"Xin Li
am: cdd572677e -s ours am skip reason: subject contains skip directive Change-Id: I5cb1d70e391d148dcd24fc459e94e6c6a5cde84e
2019-09-05Merge "DO NOT MERGE - Merge Android 10 into master"ndk-sysroot-r21Xin Li
2019-09-04DO NOT MERGE - Merge Android 10 into masterXin Li
Bug: 139893257 Change-Id: I3d98bd70a659cad37d520fb0e7ecd631f622e8fb
2019-07-02[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor ↵Xin Li
(5699924) into stage-aosp-master am: 254d13edf6 am: 3f16bebff0 -s ours am skip reason: subject contains skip directive Change-Id: I0b8c0bb303f3931f3a021f88f785eccd24538a56
2019-07-02DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵Xin Li
stage-aosp-master am: 254d13edf6 Change-Id: Ie6b328a31658515afdfeac62e8b21814b2880b6d
2019-07-01DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵temp_140451723Xin Li
stage-aosp-master Bug: 134405016 Change-Id: I63b5e97a7f3a893ccf9bfe15694d3f3f459bf8f5
2019-02-25Merge 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-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 Li
am: f78410c5ea Change-Id: Ic9054251b98264776249e6c16f51265a2efe9e10
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
Bug: 126125118 Change-Id: I74cb93a460c0ec02a11b222072c07941cbff21d8
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 03:55:56 +0000