tree 496fc9207714e432c70a35b2504f8c204e070fa5
parent 4e8d032183d5c036aecc5155d2fa0d994255a386
parent 0ddd07b0bd9bfe1faa462e936146a7abdbda267e
author Tianjie Xu <xunchang@google.com> 1476846671 +0000
committer android-build-merger <android-build-merger@google.com> 1476846671 +0000

Merge "Clean up bootloader_message usage in recovery" am: 94f4494613 am: 7691800c2e
am: 0ddd07b0bd

Change-Id: I2a58c6a62e79e2d1fce00281755b34610489b474