tree 350ac14e14ead4d2b8aba3f0f8f3221be4ceaab9
parent 660329ff2a6db2e5f0f58eaf1166c8c030fe84f3
parent 960e3bd2d0143428d3725be3f78d3d6b8d23e3f6
author Xin Li <delphij@google.com> 1591637111 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591637111 +0000

[automerger skipped] Merge QQ3A.200605.002 into master am: f671eefd76 -s ours am: c782df5d7c -s ours am: 1c9695398b -s ours am: ca5ec50b2b -s ours am: 960e3bd2d0 -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: I56ae99da7d8ea5ec77de49d733082f520aa914ca