tree e80493fadfbea81163acad933e8c82620235d8fb
parent e2a706824e8c3ffc308c3ae2cd59c95906df76c1
parent f258f601a02f45f80de34504747b57abc1119b34
author Yabin Cui <yabinc@google.com> 1476834629 +0000
committer android-build-merger <android-build-merger@google.com> 1476834629 +0000

Merge "Fix bootloader_message." am: 7c95fe10de am: 83e4e6d35c
am: f258f601a0

Change-Id: I72376cae20beeae2ee4aa13f6d28f5a61ffdce49