am 6a90d9b3: am 338c8669: (-s ours) am 2a2c2036: am e728eb91: Merge "Get fastboot working on OS X"

* commit '6a90d9b3eeee581d37dc329327a5cd1525e32503':