tree 3017710e9a7e9d083e93a434a9311981613383bb
parent b6e6201e475696f9af5e799ae749177a4ff1bff2
parent 95d0f4738c72905a53d7e2974094e402d780c309
author Elliott Hughes <enh@google.com> 1437772248 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437772248 +0000

am 51d08e8e: am 2e942a47: Merge "Fix Win32 adb build."

* commit '51d08e8e7abe50051650b1ea5936006c6d6da3e9':
  Fix Win32 adb build.