tree d38b3255e613d89357141cac6113edbefd1c0231
parent 763b52dd4556671c1dd81a76f247fc215c571977
parent f1546892e1d1201ced90a4f1af8e8f6e704e8797
author Tianjie Xu <xunchang@google.com> 1495052400 +0000
committer android-build-merger <android-build-merger@google.com> 1495052400 +0000

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

Change-Id: If5d97891ffae307ada2948b771f113e82235fd73