tree df22e98f8a3dcd0a3d83a1b5291e58df310861f2
parent 2cc4fd73d100749f4154065e4884fc912db584a9
parent 3a5f3db2aa5324518eb71c69cd1fb3e2125cbd43
author Tim Murray <timmurray@google.com> 1406255882 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1406255882 +0000

am 3a5f3db2: am c894ced1: Merge "Fix fastboot for Darwin."

* commit '3a5f3db2aa5324518eb71c69cd1fb3e2125cbd43':
  Fix fastboot for Darwin.