tree 44d33dc292fe604c7b379e0d7a98394de82e5cbf
parent 6d3b611b163768b026135f1a841b2030178809e6
parent b99d349feb5db4835d104d6154447fb58880246b
author Xin Li <delphij@google.com> 1598996794 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598996794 +0000

[automerger skipped] Merge Android R (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