tree 3e15010cef7478fd38a5605c09692932300cbb7f
parent 0985aac386843929b7a019b2f8912a86c58a3da2
parent c1865438203bba9999db90d520b56e031cb592b1
author Xin Li <delphij@google.com> 1702332131 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1702332131 +0000

[automerger skipped] Merge Android 14 QPR1 am: 09d1d59a3e -s ours am: c186543820 -s ours

am skip reason: Merged-In I28e22ee844056531e638d3a22e855917c2da9751 with SHA-1 0985aac386 is already in history

Original change: https://android-review.googlesource.com/c/device/linaro/hikey-kernel/+/2863576

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