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

* commit '674641eba44e471172c35a46460c6334bac50069':
This commit is contained in:
Elliott Hughes 2015-08-27 14:28:40 +00:00 committed by Android Git Automerger
commit b3210320fa

Diff content is not available