tree 41fc518d81e56956e90ac906833f9f86fc6f262a
parent e340f69bcdc3f3e42d815912e7f33e76358665b9
parent 661e643aac2ecd70644f9c4d57ce7435eac0277c
author Xin Li <delphij@google.com> 1599784833 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599784833 +0000

[automerger skipped] Merge Android R am: 661e643aac -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: Iba78da079e665b2c1eca941d21117b9133f49190