tree 4511c43e2ed24d872bc3142374bdbc255bf7fc22
parent 2a576e20975b9a12610d19c3d782045b7fa227b8
parent 83e4e6d35cee21700dc249e5f0e216ef0ba4f134
author Yabin Cui <yabinc@google.com> 1476834209 +0000
committer android-build-merger <android-build-merger@google.com> 1476834209 +0000

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

Change-Id: I2e3986837c7a1daaa6fa4a8c1031f619efb8b361