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

* commit 'd0c94f5bab1fcda272aa8267c00b503922ce3700':
This commit is contained in:
Elliott Hughes 2015-08-27 14:28:46 +00:00 committed by Android Git Automerger
commit bb26b72a58

Diff content is not available