am 7f45f953: (-s ours) am 0049aecf: am a6065996: Merge "Stop defining WIN32."

* commit '7f45f953add5181a4faeb40c6e25180267ae4d9c':
This commit is contained in:
Elliott Hughes 2015-08-27 05:02:16 +00:00 committed by Android Git Automerger
commit 241eca25ce

Diff content is not available