am 4bc35f3e: (-s ours) am 51d08e8e: am 2e942a47: Merge "Fix Win32 adb build."

* commit '4bc35f3e4ce5ec94f70bed6ac78cbc8ea186448f':
This commit is contained in:
Elliott Hughes 2015-08-27 11:44:12 +00:00 committed by Android Git Automerger
commit 674641eba4

Diff content is not available