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

* commit 'fc9b1bb75e4c51a910884c88845b1023d8314737':