tree b96ee8b826da69869e2aaf557f3fbb97f138b9b1
parent d9994bdea059dd72d6cb500586c0f41d5ecf2d79
parent 5bd20529ad65889aeb8b45de58f75fb7be74fd35
author Xin Li <delphij@google.com> 1633656014 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633656014 +0000

[automerger skipped] Merge Android 12 am: 5bd20529ad -s ours

am skip reason: Merged-In I48d9475f853956c601a8a88adf01e5f4ee67c1fe with SHA-1 d9994bdea0 is already in history

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

Change-Id: I49332be89e660b80dba3fc776a56cb81055eb6ee