tree 1c2defcc7b11790764229796507a2d665dd49a25
parent 6fd97b8ebeef23099bf1622872b89ebb2d146eb5
parent 4d2c4c2f434241024d25d05a304135b9035945e9
author Xin Li <delphij@google.com> 1591634521 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591634521 +0000

[automerger skipped] Merge QQ3A.200605.002 into master am: 7681165d8a -s ours am: aec1016d2b -s ours am: e59c4ad3c0 -s ours am: 4d2c4c2f43 -s ours

am skip reason: Change-Id Id0fdcf99e78a6bffeb636f6d216fa5424c890d3d with SHA-1 c481d1cc3a is in history

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

Change-Id: I42d1a7b4c142705e6eaf51c7ee3865b8e5d003d4