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)
commit3b957e9bb565fba8a293f0097034792a6e76f12d
tree13ecc6d882506b61ebbdfbee6981fc123cdd1456
parente66e5f07e7909146eeca9c8310d1cf10e4b311d2
parenta41df04d65e93d9f510f013359f81570403aa5eb
am a41df04d: (-s ours) am 800f6f4d: Merge "Use _WIN32 rather than WIN32."

* commit 'a41df04d65e93d9f510f013359f81570403aa5eb':