summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 6bcf1160d3 -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: c69d5fdf1f -s ours am skip reason: Change-Id I33b37419913bbd397207fb53212488ea3885aedd with SHA-1 8ba2a45e2b is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iba75ede331938dfbcead97fa34f003658f5cb3e2
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 6bcf1160d3 -s oursXin Li
am skip reason: Change-Id I33b37419913bbd397207fb53212488ea3885aedd with SHA-1 8ba2a45e2b is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifeb855e2c344ae7d137dab2d0382e1c9fa8fcfef
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: I33b37419913bbd397207fb53212488ea3885aedd Change-Id: I1c0b8db09fc7ab72285992daa29e49e7cee655c5
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/sdm845/thermal am: ab56da73c4 ↵Bob Badour
am: 3727fc84a8 am: c7e2b409c9 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sdm845/thermal/+/1576086 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id5646cad6ba00759c5aac0c72262132d9a897c33
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/sdm845/thermal am: ab56da73c4 ↵Bob Badour
am: 3727fc84a8 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sdm845/thermal/+/1576086 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I20654d88ea29d53c03de0223ce58177cf9a2db16
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/sdm845/thermal am: ab56da73c4Bob Badour
Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sdm845/thermal/+/1576086 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If13a6afe252bd2285e2d6a5984400aea8dd06105
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/sdm845/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: I0e2076a20c8240f074f05e03dd06386faef14714
2020-11-25Mark ab/6881855 as merged am: e181b6d041 am: 8ba2a45e2bXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sdm845/thermal/+/13109975 Change-Id: Ie1c07209bdfd1404a968c8bae1a0d0a652ae0a89
2020-11-25Mark ab/6881855 as merged am: e181b6d041Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sdm845/thermal/+/13109975 Change-Id: I33b37419913bbd397207fb53212488ea3885aedd
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I8cbd032e93be1804959a1fc714a230ea7a556337
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: b593891704 -s ours am: ↵Xin Li
3847b07ecc -s ours am: a549739c13 -s ours am skip reason: Change-Id I2480c4732265e303cf1a727ee376e367c970e929 with SHA-1 6d3b611b16 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sdm845/thermal/+/12796897 Change-Id: I0465798137437e874db3ba8e7c9d7ecfcee9eaa1
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: b593891704 -s ours am: ↵Xin Li
3847b07ecc -s ours am skip reason: Change-Id I2480c4732265e303cf1a727ee376e367c970e929 with SHA-1 6d3b611b16 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sdm845/thermal/+/12796897 Change-Id: I64e6b9906de8730be7a2d5ea46f16f68e61d7d35
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: b593891704 -s oursXin Li
am skip reason: Change-Id I2480c4732265e303cf1a727ee376e367c970e929 with SHA-1 6d3b611b16 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sdm845/thermal/+/12796897 Change-Id: Ibf9b03d3699d1082b6484d484ba34fa2208d03c8
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I2480c4732265e303cf1a727ee376e367c970e929 Change-Id: I11c80c3b8d6af17b41172eccd4090aac75e87424
2020-09-11[automerger skipped] Merge Android R am: 8a482bd1c4 -s ours am: 5ca81cbbd0 ↵Xin Li
-s ours am: 1647e7fada -s ours am: a0c8bcfa84 -s ours am: 1928a65210 -s ours am skip reason: Change-Id Id718c5b4b6d4be4b00d7774f5e6a86c74c05b684 with SHA-1 c989a84ff6 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sdm845/thermal/+/1422439 Change-Id: If71dd14a923b6f9e4a292044f1b7cc5ce01ce932
2020-09-11[automerger skipped] Merge Android R am: 8a482bd1c4 -s ours am: 5ca81cbbd0 ↵Xin Li
-s ours am: 1647e7fada -s ours am: a0c8bcfa84 -s ours am skip reason: Change-Id Id718c5b4b6d4be4b00d7774f5e6a86c74c05b684 with SHA-1 c989a84ff6 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sdm845/thermal/+/1422439 Change-Id: I00486012bcf38204cca0c17623de0127229f2f9a
2020-09-11[automerger skipped] Merge Android R am: 8a482bd1c4 -s ours am: 5ca81cbbd0 ↵Xin Li
-s ours am: 1647e7fada -s ours am skip reason: Change-Id Id718c5b4b6d4be4b00d7774f5e6a86c74c05b684 with SHA-1 c989a84ff6 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sdm845/thermal/+/1422439 Change-Id: Ieffaedf0638185218386ff09e2f18451275c2d06
2020-09-11[automerger skipped] Merge Android R am: 8a482bd1c4 -s ours am: 5ca81cbbd0 ↵Xin Li
-s ours am skip reason: Change-Id Id718c5b4b6d4be4b00d7774f5e6a86c74c05b684 with SHA-1 c989a84ff6 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sdm845/thermal/+/1422439 Change-Id: Ie7cf348090b9b160c6a86807885448256aa9435e
2020-09-11[automerger skipped] Merge Android R am: 8a482bd1c4 -s oursXin Li
am skip reason: Change-Id Id718c5b4b6d4be4b00d7774f5e6a86c74c05b684 with SHA-1 c989a84ff6 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sdm845/thermal/+/1422439 Change-Id: I393b90c061f798deb788a4ec1b687a0c16a9cb13
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: Id718c5b4b6d4be4b00d7774f5e6a86c74c05b684 Change-Id: Icfaa3f24a7210e1fb1e8305bbbdbb1dd0064bb9d
2020-09-02[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: c989a84ff6 -s ours am: b99d349feb -s ours am: fce6b1f4d2 -s ours am: a1618bd1d7 -s ours am skip reason: Change-Id Ice8deea93919c5c2b33395f82592e44c88989b28 with SHA-1 be6f16a531 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sdm845/thermal/+/12470189 Change-Id: I934b8a2244a89e93a4566a98f47c98b97081f908
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: c989a84ff6 -s ours am: b99d349feb -s ours am: fce6b1f4d2 -s ours am skip reason: Change-Id Ice8deea93919c5c2b33395f82592e44c88989b28 with SHA-1 be6f16a531 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sdm845/thermal/+/12470189 Change-Id: I146e4bebc0e8784dca3d5105e8b6b8993008b325
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: c989a84ff6 -s ours am: b99d349feb -s ours am skip reason: Change-Id Ice8deea93919c5c2b33395f82592e44c88989b28 with SHA-1 be6f16a531 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sdm845/thermal/+/12470189 Change-Id: I8bb23964cdfd5ad92b0865ab9e5a8696f1dc2367
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: c989a84ff6 -s ours am skip reason: Change-Id Ice8deea93919c5c2b33395f82592e44c88989b28 with SHA-1 be6f16a531 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sdm845/thermal/+/12470189 Change-Id: I17f9e1dcce9789852c556b1bcf313203be0d8007
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
Bug: 166295507 Merged-In: Ice8deea93919c5c2b33395f82592e44c88989b28 Change-Id: Id718c5b4b6d4be4b00d7774f5e6a86c74c05b684
2020-05-05Add METADATA to thermal: BSD+Apache2=NOTICE am: 3a68d502cb am: 069704a519 ↵Bob Badour
am: be6f16a531 am: 6d3b611b16 am: fdb6ef4521 Change-Id: If80a4b8809aa32e6839eb81bfbc5a8120eac88df
2020-05-05Add METADATA to thermal: BSD+Apache2=NOTICE am: 3a68d502cb am: 069704a519 ↵Bob Badour
am: be6f16a531 am: 6d3b611b16 Change-Id: I9b72c3fd1c9aa9bf02817a6fea419d45a5b9494a
2020-05-05Add METADATA to thermal: BSD+Apache2=NOTICE am: 3a68d502cb am: 069704a519 ↵Bob Badour
am: be6f16a531 Change-Id: I2480c4732265e303cf1a727ee376e367c970e929
2020-05-05Add METADATA to thermal: BSD+Apache2=NOTICE am: 3a68d502cb am: 069704a519Bob Badour
Change-Id: Ice8deea93919c5c2b33395f82592e44c88989b28
2020-05-05Add METADATA to thermal: BSD+Apache2=NOTICE am: 3a68d502cbandroid-r-beta-3android-r-beta-2Bob Badour
Change-Id: I89d091a6c5678235f944bd2b6ebe7796f2f4dc43
2020-05-01Add METADATA to thermal: BSD+Apache2=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I76b79239196503727e3280697650c4835394aeda
2020-03-23Merge remote-tracking branch ↵Alex Hong
'goog/qcom/release/LA.UM.7.8.9.C2.08.00.00.618.012' into rvc-dev am: 30ce54b7b0 am: e473ba3d58 am: 08972b2fe3 am: f83181006d am: 2470f7a1c2 Change-Id: Ie340590df7e46476ca1c7adafca7f55d99f42d8b
2020-03-23Merge "Merge remote-tracking branch ↵Automerger Merge Worker
'goog/qcom/release/LA.UM.7.8.9.C2.08.00.00.618.012' into rvc-dev am: 30ce54b7b0 am: 2e421e7755" into rvc-d1-dev-plus-aosp am: 0ed39094ed am: 7a0b913aed Change-Id: I6e6eb499ad98844e649d98eed36fd05deefb41f5
2020-03-23Merge remote-tracking branch ↵Alex Hong
'goog/qcom/release/LA.UM.7.8.9.C2.08.00.00.618.012' into rvc-dev am: 30ce54b7b0 am: e473ba3d58 am: 0193f4aec3 am: 86ed4af0e9 Change-Id: I1c0aeaea5c2c8a5f8c0faa7a3372aad9304c3129
2020-03-23Merge remote-tracking branch ↵Alex Hong
'goog/qcom/release/LA.UM.7.8.9.C2.08.00.00.618.012' into rvc-dev am: 30ce54b7b0 am: e473ba3d58 am: 08972b2fe3 am: f83181006d Change-Id: I44742a4a44d933f7e6e47f1b8f327efdf21db221
2020-03-23Merge "Merge remote-tracking branch ↵Automerger Merge Worker
'goog/qcom/release/LA.UM.7.8.9.C2.08.00.00.618.012' into rvc-dev am: 30ce54b7b0 am: 2e421e7755" into rvc-d1-dev-plus-aosp am: 0ed39094ed Change-Id: I91abc608e36dde44961b1360a66621287f140ba3
2020-03-23Merge remote-tracking branch ↵Alex Hong
'goog/qcom/release/LA.UM.7.8.9.C2.08.00.00.618.012' into rvc-dev am: 30ce54b7b0 am: e473ba3d58 am: 08972b2fe3 Change-Id: I04c6f942ef4ba7610e03cb9d2c59e80b279a56d7
2020-03-23Merge remote-tracking branch ↵Alex Hong
'goog/qcom/release/LA.UM.7.8.9.C2.08.00.00.618.012' into rvc-dev am: 30ce54b7b0 am: e473ba3d58 am: 0193f4aec3 Change-Id: Iec2037ac7d1e78bc6ea2827d65c5d55be9a8fd88
2020-03-23Merge "Merge remote-tracking branch ↵Automerger Merge Worker
'goog/qcom/release/LA.UM.7.8.9.C2.08.00.00.618.012' into rvc-dev am: 30ce54b7b0 am: 2e421e7755" into rvc-d1-dev-plus-aosp
2020-03-23Merge remote-tracking branch ↵Alex Hong
'goog/qcom/release/LA.UM.7.8.9.C2.08.00.00.618.012' into rvc-dev am: 30ce54b7b0 am: 2e421e7755 Change-Id: I7dc50808af151ea23726f135ce6925d4a2958aa0
2020-03-23Merge remote-tracking branch ↵android-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_r18android11-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-d2-releaseAlex Hong
'goog/qcom/release/LA.UM.7.8.9.C2.08.00.00.618.012' into rvc-dev am: 30ce54b7b0 am: e473ba3d58 Change-Id: I1ed80fe1e4165962501e5bde5761510ee37bdef7
2020-03-23Merge remote-tracking branch ↵Alex Hong
'goog/qcom/release/LA.UM.7.8.9.C2.08.00.00.618.012' into rvc-dev am: 30ce54b7b0 am: e473ba3d58 Change-Id: I7a92b91e400b809c09de97188ea6fe1ba375f6c4
2020-03-23Merge remote-tracking branch ↵Alex Hong
'goog/qcom/release/LA.UM.7.8.9.C2.08.00.00.618.012' into rvc-dev am: 30ce54b7b0 Change-Id: I0840de357728fd44ac06b53ebe80c7e3a6ca7087
2020-03-23Merge remote-tracking branch ↵android-11.0.0_r16android11-d1-b-releaseAlex Hong
'goog/qcom/release/LA.UM.7.8.9.C2.08.00.00.618.012' into rvc-dev am: 30ce54b7b0 Change-Id: I00930def061a4912dcb94cf1787b2f1f05758a86
2020-02-26Merge remote-tracking branch ↵android-mainline-12.0.0_r112android-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_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_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-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_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_r12aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseandroid11-mainline-tethering-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-devaml_tz2_305400100Alex Hong
'goog/qcom/release/LA.UM.7.8.9.C2.08.00.00.618.012' into rvc-dev Bug: 149539244 Change-Id: Id7135efe7c3b91284056270f6c119747d2b3435b
2019-10-30[automerger skipped] DO NOT MERGE - ↵Xin Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 6a8568c80a am: 5c1c45ebed -s ours am skip reason: subject contains skip directive Change-Id: Ic0dfa389aa76a53f94392f1c57921d0c55356b54
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: 6a8568c80a Change-Id: If500f4e30b62758d95b73dc851815a1cd5617b0a
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: I847f55b1cac6e5036bd28604313d685145a6b3e9
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: aa3afd9fa8 -s ours am: 84312b6396 -s ours am: 97fa980e9d -s ours am skip reason: change_id I8c96c0c822f50b12b9f703bef0e64142e3b14bc8 with SHA1 a559c4d21a is in history Change-Id: I4140f8c28d2ee8787b9e8e87ba7b6903088711e9
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: aa3afd9fa8 -s ours am: 84312b6396 -s ours am skip reason: change_id I8c96c0c822f50b12b9f703bef0e64142e3b14bc8 with SHA1 a559c4d21a is in history Change-Id: I39b439b52e3dd1a7ebe7e2c5647b075cff868268
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-06 21:50:17 +0000