summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-10-08[automerger skipped] Merge Android 12 am: 2fe2cb483c -s ours am: dd52d333d7 ↵t_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_r4android-vts-14.0_r3android-vts-14.0_r2android-vts-14.0_r1android-u-beta-1-gplandroid-security-14.0.0_r8android-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_r1android-platform-13.0.0_r1android-cts-14.0_r4android-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_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r4android-14.0.0_r39android-14.0.0_r38android-14.0.0_r3android-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_331131000main-16k-with-phonesmain-16kandroid14-tests-releaseandroid14-security-releaseandroid14-s2-releaseandroid14-s1-releaseandroid14-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-devandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releaseandroid14-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-platform-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_332714010Xin Li
-s ours am: 6137137101 -s ours am: 97ced632fc -s ours am: a8a2a7cdfa -s ours am skip reason: Merged-In Ibf8093550cfde749db7ba78ff1d462e090b920ce with SHA-1 5a7c594526 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/1847663 Change-Id: Icebeb0db48460ef73bce966e1240a61604891bab
2021-10-08[automerger skipped] Merge Android 12 am: 2fe2cb483c -s ours am: dd52d333d7 ↵Xin Li
-s ours am: 6137137101 -s ours am: 97ced632fc -s ours am skip reason: Merged-In Ibf8093550cfde749db7ba78ff1d462e090b920ce with SHA-1 5a7c594526 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/1847663 Change-Id: I34ece652115f0542d30d56fd65c5a04c392f85b2
2021-10-08[automerger skipped] Merge Android 12 am: 2fe2cb483c -s ours am: dd52d333d7 ↵android-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-1Xin Li
-s ours am: 6137137101 -s ours am skip reason: Merged-In Ibf8093550cfde749db7ba78ff1d462e090b920ce with SHA-1 5a7c594526 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/1847663 Change-Id: I4bc30d54dc7da6e9e1d5fd839d4512336a9eb6b9
2021-10-08[automerger skipped] Merge Android 12 am: 2fe2cb483c -s ours am: dd52d333d7 ↵Xin Li
-s ours am skip reason: Merged-In Ibf8093550cfde749db7ba78ff1d462e090b920ce with SHA-1 5a7c594526 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/1847663 Change-Id: Iebe2b32fc2b07431af8c836e4e5217d5b23228c8
2021-10-08[automerger skipped] Merge Android 12 am: 2fe2cb483c -s oursXin Li
am skip reason: Merged-In Ibf8093550cfde749db7ba78ff1d462e090b920ce with SHA-1 5a7c594526 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/1847663 Change-Id: I6f5559acc8f777b54dd11f8d2c08d7a75d65ba15
2021-10-06Merge Android 12android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Xin Li
Bug: 202323961 Merged-In: Ibf8093550cfde749db7ba78ff1d462e090b920ce Change-Id: I760025b3d8641178901186da26ac74c348b95fef
2021-08-18[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
5a7c594526 -s ours am: 064255bd8e -s ours am: 2848609553 -s ours am: 611df5fbe2 -s ours am skip reason: Merged-In Ic16933528208098e47018a4d024509a528bf91e9 with SHA-1 5380476154 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/15571763 Change-Id: Ifbaeff0acd6d55600a7c11cd8d8e637e5e275000
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
5a7c594526 -s ours am: 064255bd8e -s ours am: 2848609553 -s ours am skip reason: Merged-In Ic16933528208098e47018a4d024509a528bf91e9 with SHA-1 5380476154 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/15571763 Change-Id: Ic38857fb0a3c3b9e08519a49826077cec5a99b57
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
5a7c594526 -s ours am: 064255bd8e -s ours am skip reason: Merged-In Ic16933528208098e47018a4d024509a528bf91e9 with SHA-1 5380476154 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/15571763 Change-Id: Ibb2a964b7ebfaad306c08afad242098408b9219b
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
5a7c594526 -s ours am skip reason: Merged-In Ic16933528208098e47018a4d024509a528bf91e9 with SHA-1 5380476154 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/15571763 Change-Id: I8d474bbed1e27fd9255d136b7e1683977bf5087d
2021-08-14Merge sc-dev-plus-aosp-without-vendor@7634622temp_sam_202323961Xin Li
Merged-In: Ic16933528208098e47018a4d024509a528bf91e9 Change-Id: Ibf8093550cfde749db7ba78ff1d462e090b920ce
2021-03-30[automerger skipped] [LSC] Add LOCAL_LICENSE_KINDS to ↵Bob Badour
hardware/qcom/sm7150/gps am: f79f0a1d98 am: 1f335c32a0 am: 09333902e2 -s ours am: 5380476154 -s ours am skip reason: skip tag Change-Id I07267e93ebfc743a0d1e99a8a7853058b0de4c9c with SHA-1 a6d81cf4db is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/1655055 Change-Id: I9e090593335f6a933093ed0d30de1a5cb41a1e22
2021-03-30[automerger skipped] [LSC] Add LOCAL_LICENSE_KINDS to ↵android-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-devBob Badour
hardware/qcom/sm7150/gps am: f79f0a1d98 am: 1f335c32a0 am: 09333902e2 -s ours am skip reason: skip tag Change-Id I07267e93ebfc743a0d1e99a8a7853058b0de4c9c with SHA-1 a6d81cf4db is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/1655055 Change-Id: Ic16933528208098e47018a4d024509a528bf91e9
2021-03-30[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/sm7150/gps am: f79f0a1d98 am: ↵Bob Badour
1f335c32a0 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/1655055 Change-Id: I6353c63909acf43f120f393c755d3be4bac8ea04
2021-03-30[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/sm7150/gps am: f79f0a1d98android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4Bob Badour
Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/1655055 Change-Id: I6b707177fdb8f5cf8a9e1f2278ff2645e373e667
2021-03-29[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/sm7150/gpsandroid-s-beta-2android-s-beta-1Bob Badour
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD to: etc/Android.mk utils/Android.mk Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD legacy_not_a_contribution to: android/1.0/Android.mk android/1.1/Android.mk android/2.0/Android.mk Added SPDX-license-identifier-BSD to: android/utils/Android.mk batching/Android.mk core/Android.mk geofence/Android.mk gnss/Android.mk location/Android.mk pla/Android.mk Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I1f3eb010350adafd89a97bf00cbf1439d46bafdf Merged-in: I1f3eb010350adafd89a97bf00cbf1439d46bafdf Merged-in: I07267e93ebfc743a0d1e99a8a7853058b0de4c9c
2021-03-02[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/sm7150/gps am: a6d81cf4dbBob Badour
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/13741138 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I884e07d6396e2a3851798e7afcb285fbcb1e6d1d
2021-03-01[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/sm7150/gpsBob Badour
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD to: utils/Android.mk Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD legacy_not_a_contribution to: android/1.0/Android.mk android/1.1/Android.mk android/2.0/Android.mk Added SPDX-license-identifier-BSD to: android/utils/Android.mk batching/Android.mk core/Android.mk geofence/Android.mk gnss/Android.mk location/Android.mk pla/Android.mk Added legacy_notice to: etc/Android.mk Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I07267e93ebfc743a0d1e99a8a7853058b0de4c9c
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 2ac4d79108 -s ↵Xin Li
ours am: 036ea671c4 -s ours am: 9f7e4db4fd -s ours am skip reason: Change-Id I786ff01373458fb825ffef4f28c7f2df58ab742a with SHA-1 443c8faa40 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I27ef0f2480f04b73dc37cae88336a6fbf2c0ad7e
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 2ac4d79108 -s ↵Xin Li
ours am: 036ea671c4 -s ours am skip reason: Change-Id I786ff01373458fb825ffef4f28c7f2df58ab742a with SHA-1 443c8faa40 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I29cbd371d185b5a116da491d549b9c1060547a1f
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 2ac4d79108 -s oursXin Li
am skip reason: Change-Id I786ff01373458fb825ffef4f28c7f2df58ab742a with SHA-1 443c8faa40 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9d0a0ed2657f322014d460ececd7790d2aef152a
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
Bug: 180401296 Merged-In: I786ff01373458fb825ffef4f28c7f2df58ab742a Change-Id: I37e12f4e6ec1109f3bfb3c974617ac1716d74cc7
2020-11-25Mark ab/6881855 as merged am: 43fe26abf2 am: 443c8faa40Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/13112972 Change-Id: Ibcab157a14a410f6d5631e93352d783a22340acf
2020-11-25Mark ab/6881855 as merged am: 43fe26abf2Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/13112972 Change-Id: I786ff01373458fb825ffef4f28c7f2df58ab742a
2020-11-23Mark ab/6881855 as mergedandroid-s-preview-1Xin Li
Bug: 172690556 Change-Id: I5f15f8c5ba01584b98b3cd629a876f0668fd61b3
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 400bf7b388 -s ours am: ↵Xin Li
8ffe2c942b -s ours am: ca38d7ea14 -s ours am skip reason: Change-Id Ic26ba94c5a86f1998f5cb5f5e22cad6717b504d5 with SHA-1 d22b549537 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/12796898 Change-Id: Ib1546f622df47dececd3557130385952f83ed287
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 400bf7b388 -s ours am: ↵Xin Li
8ffe2c942b -s ours am skip reason: Change-Id Ic26ba94c5a86f1998f5cb5f5e22cad6717b504d5 with SHA-1 d22b549537 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/12796898 Change-Id: Ic25b83e3e2d877b8da1898ea40f9bdb780e31dca
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 400bf7b388 -s oursXin Li
am skip reason: Change-Id Ic26ba94c5a86f1998f5cb5f5e22cad6717b504d5 with SHA-1 d22b549537 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/12796898 Change-Id: Ib8328b1d8ecfd1c8dc1f89c8ef7fa6e75f3c90dd
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: Ic26ba94c5a86f1998f5cb5f5e22cad6717b504d5 Change-Id: I418b560293463f681f5618fa2d4961cade6e621a
2020-09-13Merge CR2660953 am: 8d1057762d am: 4aeb4f4b24Shinru Han
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/11685287 Change-Id: I14f24ff26f179e91bda7a1522d936c93f59e769b
2020-09-11[automerger skipped] Merge Android R am: 4328ffdd31 -s ours am: 9645db85cc ↵Xin Li
-s ours am: 66020661ae -s ours am: 50cff07bd4 -s ours am: 8fdcc65334 -s ours am skip reason: Change-Id Ibacc42681d1dbef7900940791b8620b7e4a5357a with SHA-1 3d466744f3 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/1422440 Change-Id: I3d37352ddde07bcbde362c43e33c03b59a39eff5
2020-09-11[automerger skipped] Merge Android R am: 4328ffdd31 -s ours am: 9645db85cc ↵Xin Li
-s ours am: 66020661ae -s ours am: 50cff07bd4 -s ours am skip reason: Change-Id Ibacc42681d1dbef7900940791b8620b7e4a5357a with SHA-1 3d466744f3 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/1422440 Change-Id: Id38ca99d3f12bb745c2dab1fdd7407e3039a0b6b
2020-09-11[automerger skipped] Merge Android R am: 4328ffdd31 -s ours am: 9645db85cc ↵Xin Li
-s ours am: 66020661ae -s ours am skip reason: Change-Id Ibacc42681d1dbef7900940791b8620b7e4a5357a with SHA-1 3d466744f3 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/1422440 Change-Id: I001c9d0bc01c536d2e84c1f576b1e2646e385639
2020-09-11[automerger skipped] Merge Android R am: 4328ffdd31 -s ours am: 9645db85cc ↵Xin Li
-s ours am skip reason: Change-Id Ibacc42681d1dbef7900940791b8620b7e4a5357a with SHA-1 3d466744f3 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/1422440 Change-Id: Ifb2353ea2966a4a0a8ee586b30a803dbf2e4dd07
2020-09-11[automerger skipped] Merge Android R am: 4328ffdd31 -s oursXin Li
am skip reason: Change-Id Ibacc42681d1dbef7900940791b8620b7e4a5357a with SHA-1 3d466744f3 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/1422440 Change-Id: Icb9fc6ece81fabd574deb9da16fbea0490fe37fe
2020-09-08Merge Android Rplatform-tools-30.0.5Xin Li
Bug: 168057903 Merged-In: Ibacc42681d1dbef7900940791b8620b7e4a5357a Change-Id: Ibe659537a3b5c270a69c5d7fce9bf28fd82798b8
2020-09-02[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 3d466744f3 -s ours am: bcd128d500 -s ours am: 29144c235c -s ours am: fa281650cf -s ours am skip reason: Change-Id If762d7cec6f01208e1180d76cdd8ad1ceb2c4d65 with SHA-1 aa27bb0d7c is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/12470175 Change-Id: I0148c76ca448a20d33c50efbddb63738834300ee
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 3d466744f3 -s ours am: bcd128d500 -s ours am: 29144c235c -s ours am skip reason: Change-Id If762d7cec6f01208e1180d76cdd8ad1ceb2c4d65 with SHA-1 aa27bb0d7c is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/12470175 Change-Id: I60e28a4627f6702303cd5cf3a96c300831297c7e
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 3d466744f3 -s ours am: bcd128d500 -s ours am skip reason: Change-Id If762d7cec6f01208e1180d76cdd8ad1ceb2c4d65 with SHA-1 aa27bb0d7c is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/12470175 Change-Id: I213dfa702767d7908ec40ae8215d15c2e436d981
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 3d466744f3 -s ours am skip reason: Change-Id If762d7cec6f01208e1180d76cdd8ad1ceb2c4d65 with SHA-1 aa27bb0d7c is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/12470175 Change-Id: I47533421c2cb7ed2c6160a5e6f271d578c071898
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
Bug: 166295507 Merged-In: If762d7cec6f01208e1180d76cdd8ad1ceb2c4d65 Change-Id: Ibacc42681d1dbef7900940791b8620b7e4a5357a
2020-08-25[automerger skipped] Merge QD4A.200805.003. am: f2651b06cd -s ours am: ↵Xin Li
481877323d -s ours am: b944ee3a9a -s ours am: e926696ab4 -s ours am skip reason: Change-Id I60adea4d9a0d174244b2441ce14093daf5c20efb with SHA-1 7fcd884a21 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/12437964 Change-Id: I6853d006b3e606871285b5d362768d80956b2a7a
2020-08-25[automerger skipped] Merge QD4A.200805.003. am: f2651b06cd -s ours am: ↵Xin Li
481877323d -s ours am: b944ee3a9a -s ours am skip reason: Change-Id I60adea4d9a0d174244b2441ce14093daf5c20efb with SHA-1 7fcd884a21 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/12437964 Change-Id: I00849b442181148dddbb9c6dbe9c43f33f334e8e
2020-08-25[automerger skipped] Merge QD4A.200805.003. am: f2651b06cd -s ours am: ↵Xin Li
481877323d -s ours am skip reason: Change-Id I60adea4d9a0d174244b2441ce14093daf5c20efb with SHA-1 7fcd884a21 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/12437964 Change-Id: I9dfb916e1ccac1ab72b286fb05a8ac67d7a1a8e6
2020-08-25[automerger skipped] Merge QD4A.200805.003. am: f2651b06cd -s oursXin Li
am skip reason: Change-Id I60adea4d9a0d174244b2441ce14093daf5c20efb with SHA-1 7fcd884a21 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/12437964 Change-Id: I61022f7038edc67970f6194051a9243c00e53352
2020-08-24Merge QD4A.200805.003.Xin Li
Bug: 160260413 Change-Id: I5342fa1d6072fba9d3d57d09f9e03ed62f60e50c Merged-In: I60adea4d9a0d174244b2441ce14093daf5c20efb
2020-06-28Add METADATA to gps: BSD+Apache2=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Exempt-From-Owner-Approval: janitorial work Change-Id: Ied87481ae38c80683f9c814232e64f9032139bed
2020-06-17Only allow one extension obj of each type to be created am: cd5ef1dfc2 am: ↵Automerger Merge Worker
927ce890b3 am: aa27bb0d7c am: d22b549537 am: fe951453a7 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/10368414 Change-Id: Ie4f2f88fcf025dbe27886fe0c46e19be4108bab3
2020-06-17Only allow one extension obj of each type to be created am: cd5ef1dfc2 am: ↵Automerger Merge Worker
927ce890b3 am: aa27bb0d7c am: d22b549537 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/10368414 Change-Id: I7d15cea957a6c11937ff269f8fd8742f3b047fa1
2020-06-17Only allow one extension obj of each type to be created am: cd5ef1dfc2 am: ↵Automerger Merge Worker
927ce890b3 am: aa27bb0d7c Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/10368414 Change-Id: Ic26ba94c5a86f1998f5cb5f5e22cad6717b504d5
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-15 18:39:29 +0000