tree c8575d03172cf21a872134b3f8146fcee13ef4ab
parent 8da2dea8ea132f322fa37d17d0c650d2ca31e9af
parent 97239e5f072dfa6d71029b4d7275164d92628bb9
author Xin Li <delphij@google.com> 1598996812 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598996812 +0000

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