tree b6fefed371d6ae637cc2f10e08b2367666483dda
parent 1de89478ac5dcb751c1d4e3fcb4fd5ba0512fbc8
parent 5c75b529f684b388c91c7e7d0b2c7fece376ac1d
author Josh Gao <jmgao@google.com> 1446490741 +0000
committer android-build-merger <android-build-merger@google.com> 1446490741 +0000

Merge "adb: use correct _WIN32 macro."
am: 5c75b529f6

* commit '5c75b529f684b388c91c7e7d0b2c7fece376ac1d':
  adb: use correct _WIN32 macro.