commit | 047e8b06ed901ba1def36798f2db90c0e363448d | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Sep 11 02:02:50 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 02:02:50 2020 +0000 |
tree | c8575d03172cf21a872134b3f8146fcee13ef4ab | |
parent | 97239e5f072dfa6d71029b4d7275164d92628bb9 [diff] | |
parent | 2c4d408942504d414cc26935fb7aeeaeb3371ff5 [diff] |
[automerger skipped] Merge Android R am: ff9d761111 -s ours am: 2c4d408942 -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