tree dcc2657fb7193a49e4ebfe272d882dac80dbc0af
parent f7377862c8deb09d0b09c68768b9c5f3266da043
parent 36fc1b06eca8b1b3e36558a0d0ef56b01001395f
author Xin Li <delphij@google.com> 1660698996 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1660698996 +0000

[automerger skipped] DO NOT MERGE - Merge Android 13 am: 36b61ef220 -s ours am: 36fc1b06ec -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: I252963b89442ada83556c7f5b8e04c3bc14e0f98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>