tree 65dabd18a359e82fbdc9053a5a31df55095c19d0
parent 454f35fd759b3db5f0e87309c15e7943e527534d
parent 10766eac61120732f11b82b1695207a3a5870a47
author Colin Cross <ccross@android.com> 1429563190 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429563190 +0000

am 10766eac: am 6de70784: am 631cf146: Merge "Fix windows adb build"

* commit '10766eac61120732f11b82b1695207a3a5870a47':
  Fix windows adb build