tree 0633745a468bfef9be854dc53ab1cc949304da51
parent 09b5b49e9b2c26f41fb08f78b9c928f0b9f78026
parent 00d389f39208c0d4d58b43eb87059ce4c8d42ced
author Josh Gao <jmgao@google.com> 1470947171 +0000
committer android-build-merger <android-build-merger@google.com> 1470947171 +0000

Merge "DO NOT MERGE: adb: reenable (and fix) Windows build." into mnc-dev am: 73c59ad77c am: 015d662cb8
am: 00d389f392

Change-Id: I37bd5978fd4ca52eda6960116103d321eef432fb