tree 896971304079e5c94526f6a65f2e1e681856cfd4
parent 6034bcdb5b0636ea9faf260875af109d477ef8e7
parent 84219d366d49ce40690b7d3b2c215a77d5cf2b08
author Treehugger Robot <treehugger-gerrit@google.com> 1629312333 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1629312333 +0000

Merge changes I5f1a954d,Ibeaac890,Id9f9dfc5 am: deee9bafec am: 86b6dd30be am: 6bc6f57e2f am: 84219d366d

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

Change-Id: I31e3daba8b019eb1455f20e193340f3888c328b8