summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-11-05Replace is-board-platform[-in-list] with is-board-platform[-in-list]2 am: ↵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_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_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_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-s5-releaseandroid14-qpr2-s4-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-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_332714010Sasha Smundak
bffc5ece09 am: 1d00f9a295 am: bec3ad636d am: c41f5bdc98 am: 31ea17f520 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm8150/thermal/+/1871700 Change-Id: Iab090a33be025196a7a9c3b6def0b8e2eca6d487
2021-11-05Replace is-board-platform[-in-list] with is-board-platform[-in-list]2 am: ↵Sasha Smundak
bffc5ece09 am: 1d00f9a295 am: bec3ad636d am: c41f5bdc98 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm8150/thermal/+/1871700 Change-Id: I6ffdbda927e87484e9596ffeddf63db401184ff2
2021-11-05Replace is-board-platform[-in-list] with is-board-platform[-in-list]2 am: ↵Sasha Smundak
bffc5ece09 am: 1d00f9a295 am: bec3ad636d Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm8150/thermal/+/1871700 Change-Id: I308ecc28b3d164239295fdbbf29856353892c97b
2021-11-05Replace is-board-platform[-in-list] with is-board-platform[-in-list]2 am: ↵Sasha Smundak
bffc5ece09 am: 1d00f9a295 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm8150/thermal/+/1871700 Change-Id: I6b2a7fbb1f36af23cbb68109e0a54068157b6a40
2021-11-05Replace is-board-platform[-in-list] with is-board-platform[-in-list]2 am: ↵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-1Sasha Smundak
bffc5ece09 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm8150/thermal/+/1871700 Change-Id: I09e9dddad9cb6c093844623a0bd28a469a53da9c
2021-10-28Replace is-board-platform[-in-list] with is-board-platform[-in-list]2Sasha Smundak
Bug: 201477826 Test: treehugger This change has been generated by the following script: ``` #! /bin/bash declare -r files="$(grep -rlP '^[^#]*call +is-board-platform' --include '*.mk' --exclude 'utils_test.mk' --exclude 'utils_sample_usage.mk')" [[ -z "$files" ]] || sed -i -r -f <(cat <<"EOF" s/ifeq +\(\$\(call is-board-platform,(.*)\), *true\)/ifneq (,$(call is-board-platform2,\1))/ s/ifeq +\(\$\(call is-board-platform,(.*)\), *\)/ifeq (,$(call is-board-platform2,\1))/ s/ifneq +\(\$\(call is-board-platform,(.*)\), *true\)/ifeq (,$(call is-board-platform2,\1))/ s/ifeq +\(\$\(call is-board-platform-in-list,(.*)\), *true\)/ifneq (,$(call is-board-platform-in-list2,\1))/ s/ifeq +\(\$\(call is-board-platform-in-list,(.*)\), *\)/ifeq (,$(call is-board-platform-in-list2,\1))/ s/ifeq +\(\$\(call is-board-platform-in-list,(.*)\), *false\)/ifeq (,T) # TODO: remove useless check/ s/ifneq +\(\$\(call is-board-platform-in-list,(.*)\), *true\)/ifeq (,$(call is-board-platform-in-list2,\1))/ s/\$\(call is-board-platform,(.*)\)/$(call is-board-platform2,\1)/ EOF ) $files ``` Change-Id: I080d9387954e01d43c8b8c426dd5c533e5058fce
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 2d6294b647 -s ↵Xin Li
ours am: 26a6e6be8f -s ours am: a17a5c0f46 -s ours am skip reason: Change-Id I6657e1cdcb836d87fc62f92d0f8705dad94fb510 with SHA-1 71aaa15262 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia264fdaa9bc168ee8fc0149677a564d82b5a3720
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 2d6294b647 -s ↵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-1Xin Li
ours am: 26a6e6be8f -s ours am skip reason: Change-Id I6657e1cdcb836d87fc62f92d0f8705dad94fb510 with SHA-1 71aaa15262 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic89c76fb7b7b3b5f02cfac55c317de1a2135dcf6
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 2d6294b647 -s oursXin Li
am skip reason: Change-Id I6657e1cdcb836d87fc62f92d0f8705dad94fb510 with SHA-1 71aaa15262 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2c368f0980379c84bc4f0a4ee83106954e145618
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Xin Li
Bug: 180401296 Merged-In: I6657e1cdcb836d87fc62f92d0f8705dad94fb510 Change-Id: I1ca4dee70ec490a5eef0f048fcfd1aca2302b7f0
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/sm8150/thermal am: 20de91d793 ↵Bob Badour
am: 96bfdc13ce am: ba08d7056b am: a30fa09434 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm8150/thermal/+/1576132 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic8909affe716e1e0c64cfe34c3a921ae4b748cbe
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/sm8150/thermal am: 20de91d793 ↵Bob Badour
am: 96bfdc13ce am: ba08d7056b Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm8150/thermal/+/1576132 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic66e20e549fec1a77583732fe6a1e8745ad5fad5
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/sm8150/thermal am: 20de91d793 ↵Bob Badour
am: 96bfdc13ce Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm8150/thermal/+/1576132 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I76a00bb5aca22310032dce00886bd4913c7fcd07
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/sm8150/thermal am: 20de91d793Bob Badour
Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm8150/thermal/+/1576132 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ibfc51ca6886dd874bbccaf7a1e73e33b4a23ba06
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/sm8150/thermalandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD legacy_not_a_contribution to: Android.mk Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I1f09622f9f2679a698f53b032f86631421b6d9d7
2020-11-23Mark ab/6881855 as merged am: 76c88b45bd am: 71aaa15262Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm8150/thermal/+/13112953 Change-Id: Ib66bc0ab0f6f564362f41f48d271113b268954da
2020-11-23Mark ab/6881855 as merged am: 76c88b45bdXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm8150/thermal/+/13112953 Change-Id: I6657e1cdcb836d87fc62f92d0f8705dad94fb510
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I0e94d83bd37401ac9262330fedfd3cdefd554b9a
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: a9df92faa4 -s ours am: ↵Xin Li
b6516784e1 -s ours am: 160d95c116 -s ours am skip reason: Change-Id Ia8f75a96ac6e368d2538977c67db4d5c190eca08 with SHA-1 8da2dea8ea is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm8150/thermal/+/12796880 Change-Id: Idad4d6aae24678eaf5ec287b6ed797c3bdad9251
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: a9df92faa4 -s ours am: ↵Xin Li
b6516784e1 -s ours am skip reason: Change-Id Ia8f75a96ac6e368d2538977c67db4d5c190eca08 with SHA-1 8da2dea8ea is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm8150/thermal/+/12796880 Change-Id: I6b187cd9943e8ac9fbe48d71b7ecaa865ecbc404
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: a9df92faa4 -s oursXin Li
am skip reason: Change-Id Ia8f75a96ac6e368d2538977c67db4d5c190eca08 with SHA-1 8da2dea8ea is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm8150/thermal/+/12796880 Change-Id: Iec32190aa1237186511f0ef7a472d67a3d3af6bd
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: Ia8f75a96ac6e368d2538977c67db4d5c190eca08 Change-Id: I4a9347667bb23ce8d971cbed6a297c4954448756
2020-09-11[automerger skipped] Merge Android R am: ff9d761111 -s ours am: 2c4d408942 ↵Xin Li
-s ours am: 047e8b06ed -s ours am: f2b69134dc -s ours am: f029ad0286 -s ours am skip reason: Change-Id I76c7b62b7500c6af1fcfca614958c0993d921528 with SHA-1 d59a6f53d3 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm8150/thermal/+/1422402 Change-Id: Ifb5fd0de9b590ad60554630b7318548d1fded7b5
2020-09-11[automerger skipped] Merge Android R am: ff9d761111 -s ours am: 2c4d408942 ↵Xin Li
-s ours am: 047e8b06ed -s ours am: f2b69134dc -s ours am skip reason: Change-Id I76c7b62b7500c6af1fcfca614958c0993d921528 with SHA-1 d59a6f53d3 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm8150/thermal/+/1422402 Change-Id: Ie47388312868f4dd8a53d0deebb1036bd6374bbd
2020-09-11[automerger skipped] Merge Android R am: ff9d761111 -s ours am: 2c4d408942 ↵Xin Li
-s ours am: 047e8b06ed -s ours am skip reason: Change-Id I76c7b62b7500c6af1fcfca614958c0993d921528 with SHA-1 d59a6f53d3 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm8150/thermal/+/1422402 Change-Id: I248956bb396480a5ffca5490090d7cd9715f9749
2020-09-11[automerger skipped] Merge Android R am: ff9d761111 -s ours am: 2c4d408942 ↵Xin Li
-s ours am skip reason: Change-Id I76c7b62b7500c6af1fcfca614958c0993d921528 with SHA-1 d59a6f53d3 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm8150/thermal/+/1422402 Change-Id: I81ce58c80e8e7f9d9fbb49a6960403c43dca4fcd
2020-09-11[automerger skipped] Merge Android R am: ff9d761111 -s oursXin Li
am skip reason: Change-Id I76c7b62b7500c6af1fcfca614958c0993d921528 with SHA-1 d59a6f53d3 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm8150/thermal/+/1422402 Change-Id: I7ec7a7aac11a4bc19fbf362c7b501cb32064647b
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: I76c7b62b7500c6af1fcfca614958c0993d921528 Change-Id: Ia5292c9546da8e4586b813ffa2a69edb6e35bd8f
2020-09-02[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: d59a6f53d3 -s ours am: 97239e5f07 -s ours am: 7d057913a0 -s ours am: 8781227663 -s ours am skip reason: Change-Id I84ebef54432ccd94172f01d5c20984fec0e6a480 with SHA-1 4c81a5e777 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm8150/thermal/+/12469638 Change-Id: I7bffb19ff326800f526e0d1e0e81cda5db209204
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: d59a6f53d3 -s ours am: 97239e5f07 -s ours am: 7d057913a0 -s ours am skip reason: Change-Id I84ebef54432ccd94172f01d5c20984fec0e6a480 with SHA-1 4c81a5e777 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm8150/thermal/+/12469638 Change-Id: I7f7c03c4cf5fc75273233d2bf4066c24e1f5f2bc
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: d59a6f53d3 -s ours am: 97239e5f07 -s ours am skip reason: Change-Id I84ebef54432ccd94172f01d5c20984fec0e6a480 with SHA-1 4c81a5e777 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm8150/thermal/+/12469638 Change-Id: Ia430565d45daaeef767104772ce057c2483b2843
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: d59a6f53d3 -s ours am skip reason: Change-Id I84ebef54432ccd94172f01d5c20984fec0e6a480 with SHA-1 4c81a5e777 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm8150/thermal/+/12469638 Change-Id: Ibe6f063193b69fd951a59e6b8c8d7677a4cbacc2
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
Bug: 166295507 Merged-In: I84ebef54432ccd94172f01d5c20984fec0e6a480 Change-Id: I76c7b62b7500c6af1fcfca614958c0993d921528
2020-05-05Add METADATA to sm8150/thermal: Apache2+BSD=NOTICE am: c6b8856c4a am: ↵Bob Badour
2f27907a27 am: 4c81a5e777 am: 8da2dea8ea am: a98b688882 Change-Id: I3d435c380889aa8358fe5892f1c5cfd5c81ed0c0
2020-05-05Add METADATA to sm8150/thermal: Apache2+BSD=NOTICE am: c6b8856c4a am: ↵Bob Badour
2f27907a27 am: 4c81a5e777 am: 8da2dea8ea Change-Id: I6157f7975ca2d777363bd641f4ff1f891f2c9126
2020-05-05Add METADATA to sm8150/thermal: Apache2+BSD=NOTICE am: c6b8856c4a am: ↵Bob Badour
2f27907a27 am: 4c81a5e777 Change-Id: Ia8f75a96ac6e368d2538977c67db4d5c190eca08
2020-05-05Add METADATA to sm8150/thermal: Apache2+BSD=NOTICE am: c6b8856c4a am: 2f27907a27Bob Badour
Change-Id: I84ebef54432ccd94172f01d5c20984fec0e6a480
2020-05-05Add METADATA to sm8150/thermal: Apache2+BSD=NOTICE am: c6b8856c4aandroid-r-beta-3android-r-beta-2Bob Badour
Change-Id: If3376bd98e60e15dec3d2474584146bbddc5bf96
2020-04-27Add METADATA to sm8150/thermal: Apache2+BSD=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I0aac88c2f40a8ea351596d63c9fc668d8b5cf3d7
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 3a2c4cfa8b -s ours am: 00bdb4cbbb am: d7f3df2fe8 am: 2861df7cb7 -s ours am skip reason: subject contains skip directive Change-Id: I627eb403a51a6d2b5ba14cb709cf6f26f7ef7a23
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 3a2c4cfa8b -s ours am: 00bdb4cbbb am: d7f3df2fe8 Change-Id: I0a2ac9b84ce926afbc6762328793e9efa4eb5b1c
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 3a2c4cfa8b -s ours am: 00bdb4cbbb Change-Id: I3282d595e6a9ed73a8637babfb0c3fe16f239a8c
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 3a2c4cfa8b -s ours am skip reason: subject contains skip directive Change-Id: I261438e817216b28a059f297ce612dfc60dbf82b
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: I677799210cc188075e0cf9ae0389cb922e82327a
2020-03-26Remove redundant NOTICE copied from LICENSE. am: 0fd4cde09a am: 9244866391 ↵Bob Badour
am: 363ff15332 am: 2fb4c3ee3e am: a92237a038 Change-Id: Ie202c6493fa277dd158144e285fec1ec2d8a4196
2020-03-26Remove redundant NOTICE copied from LICENSE. am: 0fd4cde09a am: 9244866391 ↵Bob Badour
am: 363ff15332 am: 2fb4c3ee3e Change-Id: Ic05b5f1e68af8cfccae326f52f5053d89a9ccd3d
2020-03-26Remove redundant NOTICE copied from LICENSE. am: 0fd4cde09a am: 9244866391 ↵Bob Badour
am: 363ff15332 Change-Id: I203662895e665617fa136a8490ea5c8c70272548
2020-03-26Remove redundant NOTICE copied from LICENSE. am: 0fd4cde09a am: 9244866391Bob Badour
Change-Id: I08dc34b26e01796534eec1f1b19ab1ee861e71ca
2020-03-26Remove redundant NOTICE copied from LICENSE. am: 0fd4cde09a am: 9244866391Bob Badour
Change-Id: Ife48f504ad48394665e3c303087993fef852bf6b
2020-03-26Remove redundant NOTICE copied from LICENSE. am: 0fd4cde09aBob Badour
Change-Id: Ic55e7c984ab25af0ef0b88a6c53c567f779c3c92
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 22:56:42 +0000