tree f56eb552981b58a2931abee021bf5c48e62adbfa
parent 870b87dfc88fa3c578d793d8694346c3a2c4ce04
parent 9a707b08ef883723e564833c187c3e8bdf0f9953
author Tao Bao <tbao@google.com> 1481843759 +0000
committer android-build-merger <android-build-merger@google.com> 1481843759 +0000

Merge "Add update_bootloader_message() to fix two-step OTAs." am: 26d972c9d2
am: 9a707b08ef

Change-Id: Ia42e91fd952b99bd5631ee419cbc402902a867f4