tree 64046005eaba4aee9b666972c0731af3df3a9a2c
parent c2f3fca801e40d9221cef65f68e07fd88d1deda0
parent a75a4c157b11ae89f9637c1f3a3bd89ac4f1352a
author Treehugger Robot <treehugger-gerrit@google.com> 1624392985 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1624392985 +0000

Merge changes I63a8ceda,Ibc34b74a am: cc82fd9795 am: a75a4c157b

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

Change-Id: I82a0e3880e36bd15f30df7f418eaceb13bd4fa89