tree e033bde8816f3c710857cc044ba291d94c0168f5
parent df3751fcc9ef6c1aa78e0eef89b5be4053f59c69
parent 90a2f55c9a8143eccecd550008c322ba96b08a72
author Treehugger Robot <treehugger-gerrit@google.com> 1655924900 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1655924900 +0000

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

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

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