tree 39debe8de0e1deaed6cc20ab2cc7ba67c0f48707
parent f4b2e91d50898853eaee570cdc0cdbf09977414b
parent 9d609a38220e1c1426b3649cd6eb668be886a472
author Xin Li <delphij@google.com> 1693341450 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1693341450 +0000

[automerger skipped] Merge Android U (ab/10368041) am: 7595ce9d42 -s ours am: 0777f91c44 -s ours am: 9fb640e83b -s ours am: 9d609a3822 -s ours

am skip reason: Merged-In I08625e9f011e1c8946af4c8e0f80018b54168709 with SHA-1 6774a2ad07 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm7250/display/+/24182713

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