commit | a0c8bcfa84575d6de9ac43b1acb102ed008b7926 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Sep 11 03:33:22 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 03:33:22 2020 +0000 |
tree | 44d33dc292fe604c7b379e0d7a98394de82e5cbf | |
parent | fce6b1f4d22887832f27c15b9aaa4beb72302238 [diff] | |
parent | 1647e7fada3b95cb23d2ec7821d0ec8a6b3b0c0a [diff] |
[automerger skipped] Merge Android R am: 8a482bd1c4 -s ours am: 5ca81cbbd0 -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