tree 5832ae50ed07fc861aa254868ec2a154f4213b69
parent 156c2e37ed91c56831826f30c043191f1432a0d9
parent 2151008a2fca9a26e4eeb2993c6ee7074a716796
author Xin Li <delphij@google.com> 1665016363 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1665016363 +0000

[automerger skipped] Merge TP1A.221005.003 am: 8b218acf92 am: 2151008a2f -s ours

am skip reason: Merged-In Ie8c226d9e7d1d0dc481d026ccd454a1db46fb915 with SHA-1 c9a0d7b113 is already in history

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

Change-Id: Iabc0f9d859ee18da8f7ad52e3ff10138f464a04a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>