tree e033bde8816f3c710857cc044ba291d94c0168f5
parent 1dfd360dbee26561c72ab4b9a78ce70f816eeb4f
parent e2d0f44cda393b7c329bcd3ebb7df05975ce540f
author Treehugger Robot <treehugger-gerrit@google.com> 1655927603 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1655927603 +0000

Merge "hikey960: Switch to bootcontrol 1.2" am: 498610c467 am: e788a0fd21 am: 90a2f55c9a am: f09a409ed4 am: e2d0f44cda

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

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