OSDN Git Service

am a6065996: Merge "Stop defining WIN32."
authorElliott Hughes <enh@google.com>
Thu, 20 Aug 2015 21:43:16 +0000 (21:43 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 20 Aug 2015 21:43:16 +0000 (21:43 +0000)
* commit 'a6065996cd280acf11f199c1f90e1b8886635207':
  Stop defining WIN32.


Trivial merge