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

Merge changes I63a8ceda,Ibc34b74a am: cc82fd9795

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

Change-Id: I98c78f85bd8830b7f0182f0bba81f94e9d507558