tree f0abcbb9970bde49ee3b2c7531b022fac4315cfa
parent 22e5a4b90cfdf0f79ae50ac25175d77ad977b8c9
parent d05a64fab25cba1c320b5dda336b39fe1c36ac9b
author Treehugger Robot <treehugger-gerrit@google.com> 1644999629 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1644999629 +0000

Merge changes I22cfd132,If6784590 am: 92fd6ed17b am: b2bb602e7b am: d05a64fab2

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

Change-Id: I08da28d0a7d8a5eec23dd423063b694e6a50e97b