tree d8be086de37939193cae67e281458d3317a95f25
parent 835df4aebc9ec81ae97c792119796abef3057f5d
parent 924869d4eeb0926b991d1369f59b81419d251d52
author Elliott Hughes <enh@google.com> 1429476548 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429476548 +0000

am 924869d4: am 34c91edd: Merge "Fix the Windows adb build."

* commit '924869d4eeb0926b991d1369f59b81419d251d52':
  Fix the Windows adb build.