am 59b3bd27: (-s ours) am 896d0ee2: am 999fd4ea: Merge "Also -DWIN32 to keep llvm building."

* commit '59b3bd27a05636afa50d72167fe2ef09c6986f9e':
This commit is contained in:
Elliott Hughes 2015-08-27 05:02:13 +00:00 committed by Android Git Automerger
commit bb89c75397

Diff content is not available