tree 3476e7c2bc57650abe33470821239e47f9114e41
parent 647b1e9c250165e8394b0810b64dba891488fc0e
parent 1941f61fb66751cf13a239f875251976e01fd847
author Tianjie Xu <xunchang@google.com> 1495053315 +0000
committer android-build-merger <android-build-merger@google.com> 1495053315 +0000

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

Change-Id: I1148a20467db687dac5de9150936d0bb3516f8dc