tree dea82f58d84a2f122b332d73ab8270af94f718b0
parent 9539cdb3c03c88ef366b48aca55a641f0b78066e
parent 1d6f88675bc755b735e045201086c93a555d422a
author Tianjie Xu <xunchang@google.com> 1495052249 +0000
committer android-build-merger <android-build-merger@google.com> 1495052249 +0000

Merge "Fix the input parameter for "set_retry_bootloader_message"" am: 0e60ccdc76
am: 1d6f88675b

Change-Id: I280282a1b2676e3030a0327239781f50fb7a64d8