tree e033bde8816f3c710857cc044ba291d94c0168f5
parent 90a2f55c9a8143eccecd550008c322ba96b08a72
parent 391649085257e7434991dd6f81fae3f7b21b5878
author Xin Li <delphij@google.com> 1656540770 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1656540770 +0000

[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 3916490852 -s ours

am skip reason: Merged-In Iffdeb8510c52764423166b5dc7168c7438260257 with SHA-1 51a2bd40e6 is already in history

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

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