tree e033bde8816f3c710857cc044ba291d94c0168f5
parent f09a409ed49e09c8d5b925f7c34b84adcb9765b4
parent e27bd83b6c85ed7b991f81d76f1bf6bc986c82dc
author Xin Li <delphij@google.com> 1656543381 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1656543381 +0000

[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 3916490852 -s ours am: e27bd83b6c -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: Ia1697579993c12411d75c2ae69632d1b6c8bdb32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>