tree c6d4a445999cd639750ec388a996339141a41df3
parent ba471ce8835cd23c49b95c6c0b7ba900ce432d8f
parent 498610c467936bb79ca08c9d871c902decc06cf3
author Treehugger Robot <treehugger-gerrit@google.com> 1655922118 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1655922118 +0000

Merge "hikey960: Switch to bootcontrol 1.2" am: 498610c467

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

Change-Id: Ic75811f61d2311e1589bec75b039a6cd7c43b9d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>