tree 41fc518d81e56956e90ac906833f9f86fc6f262a
parent ed4b2be34d9bca16bb9c038a78aac8c5ea617422
parent 0fa4074050c96eb2e1f64cb4cb46f32951bf7e58
author Xin Li <delphij@google.com> 1599789772 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599789772 +0000

[automerger skipped] Merge Android R am: 661e643aac -s ours am: 0fa4074050 -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: I3e6883f253aa6d1f7264600f3ed32a7a913f2d15