OSDN Git Service

am 800f6f4d: Merge "Use _WIN32 rather than WIN32."
authorElliott Hughes <enh@google.com>
Thu, 20 Aug 2015 21:55:04 +0000 (21:55 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 20 Aug 2015 21:55:04 +0000 (21:55 +0000)
* commit '800f6f4dcb8ddcbc4ef4ce119892abf07852b233':
  Use _WIN32 rather than WIN32.


Trivial merge