tree 117bfe04f526da5c19efbdb5849b56c5d3aefcfa
parent 8dacc4102da3fa65641a5c2f89dc8b90b0501c0a
parent f671eefd766c4e60b20b9aa41524ee6b4cae269b
author Xin Li <delphij@google.com> 1591631811 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591631811 +0000

[automerger skipped] Merge QQ3A.200605.002 into master am: f671eefd76 -s ours

am skip reason: Change-Id I470b39290db53f496c2328e196ddfcf82a3b3ada with SHA-1 8dacc4102d is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sdm845/display/+/1323224

Change-Id: Ia5170e5cc6451c70e46a29528031f899ea24479b