am 425702fa: (-s ours) am 89b26e28: am e03d0322: Merge "fastboot should say which device it\'s waiting for."

* commit '425702fa23411dc99b52a3ab58b263e87f7fb624':