tree 41fc518d81e56956e90ac906833f9f86fc6f262a
parent 2a627c96303dd249f1af99afbd031d8c4ba8891f
parent 3ba91df997573fc7e0f3b6ab4fc5030eb0ba14c5
author Xin Li <delphij@google.com> 1599859663 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599859663 +0000

[automerger skipped] Merge Android R am: 661e643aac -s ours am: 0fa4074050 -s ours am: 3c7dbbcb47 -s ours am: 9ae9c2f498 -s ours am: 3ba91df997 -s ours

am skip reason: Change-Id I9442538fdd0e5c1b7ad7b31dae5d175e292818ea with SHA-1 e340f69bcd is in history

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

Change-Id: I2004cf6b59493587a721108436d21ab58d56dac4