tree dcc2657fb7193a49e4ebfe272d882dac80dbc0af
parent 30259f3230df90b01a150d22dc960ebb35e69bf2
parent 9b0ceb176dd90ed4204adeef4f56e0b56fa064a6
author Xin Li <delphij@google.com> 1660700668 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1660700668 +0000

[automerger skipped] DO NOT MERGE - Merge Android 13 am: 36b61ef220 -s ours am: 36fc1b06ec -s ours am: 9b0ceb176d -s ours

am skip reason: Merged-In Ifae54924e2e2b6cf8fc04cb1aa6b20a619af916a with SHA-1 57eedd9c73 is already in history

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

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