tree 0f7256d10e63bb682c79d3a1ff123a092ab06a38
parent 69c117c2ffb71cdbfde71c65d510014e162a1016
parent 7c95fe10de540fd6c2c6c8facb4676188f2a4345
author Yabin Cui <yabinc@google.com> 1476833788 +0000
committer android-build-merger <android-build-merger@google.com> 1476833788 +0000

Merge "Fix bootloader_message."
am: 7c95fe10de

Change-Id: I102d5b27dcb295e82b7ec094a641a43efca793dc