tree 120397e98dc6a3bb091a08219a6d2362c2313693
parent 858cd9db3f8712495c03282fb81c5e5d6924285b
parent 631cf146274e4f0ef425fd491d39c969a20628a1
author Colin Cross <ccross@android.com> 1429561136 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429561136 +0000

am 631cf146: Merge "Fix windows adb build"

* commit '631cf146274e4f0ef425fd491d39c969a20628a1':
  Fix windows adb build