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

* commit '338c8669f7cab1823ab3bea60c2ba9549cdfeb9f':