tree e033bde8816f3c710857cc044ba291d94c0168f5
parent 98acb0c36fed2fa7af85661fec55226b7f2396bf
parent e788a0fd21ca23086abffd0ae26d39bdfdb4aaaa
author Treehugger Robot <treehugger-gerrit@google.com> 1655923779 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1655923779 +0000

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

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

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