tree 896971304079e5c94526f6a65f2e1e681856cfd4
parent 7ab2e4d0e6bb082de4994a3a2088d6c7c273f2a2
parent 6bc6f57e2fc0a475efe75af20afcc445da2b0c1f
author Treehugger Robot <treehugger-gerrit@google.com> 1629311488 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1629311488 +0000

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

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

Change-Id: Icb54b1a587534a4b81d835443159ff0f381e52eb