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