am 187afaf5: (-s ours) am 7d86f5e5: am 239f6ac8: Merge "Fix Win32 adb build (for the second time today)."

* commit '187afaf54f76f4a4a2598de7c66f8ecf32c0ee2a':
This commit is contained in:
Elliott Hughes 2015-08-27 11:44:46 +00:00 committed by Android Git Automerger
commit d0c94f5bab

Diff content is not available