tree 686d3df09c9c78d8689cf04457d9283af97a2986
parent ecd1b9391365fe65f1be3f9baeaf853f1c55e50f
parent cc75268246d83892d117bdcb6e97d545ebc12e53
author Xin Li <delphij@google.com> 1599795192 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599795192 +0000

[automerger skipped] Merge Android R am: 0c52cbf7cf -s ours am: d95dac3354 -s ours am: cc75268246 -s ours

am skip reason: Change-Id I0840ec224cd0e2d3c5573f884c4388579f2ee76a with SHA-1 1e442be16e is in history

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

Change-Id: Ide452f53b047d30db3d22ce486ca4d3af7adb855