OSDN Git Service

am a41df04d: (-s ours) am 800f6f4d: Merge "Use _WIN32 rather than WIN32."
authorElliott Hughes <enh@google.com>
Thu, 27 Aug 2015 05:25:27 +0000 (05:25 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 05:25:27 +0000 (05:25 +0000)
* commit 'a41df04d65e93d9f510f013359f81570403aa5eb':


Trivial merge