tree 9781018971ee70371fc94d4775dc1d443c163664
parent 55b53f7de89d7c72826b07cf8f708742722bc644
parent 16e8943b033342f9e9d491ac7d3df73fcd4a2daf
author Xin Li <delphij@google.com> 1633657145 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633657145 +0000

[automerger skipped] Merge Android 12 am: a8ab2b0804 -s ours am: 16e8943b03 -s ours

am skip reason: Merged-In Ic2c3f7fb5d5107f5abaef402f7ed69d6d675e00c with SHA-1 546bf09be0 is already in history

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

Change-Id: I538e6ee65e401b281996886dd90466339b022862