OSDN Git Service

am 204b4157: am f8a6a2f6: Merge "Use _WIN32 rather than HAVE_WINSOCK."
authorElliott Hughes <enh@google.com>
Thu, 30 Jul 2015 15:47:11 +0000 (15:47 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 30 Jul 2015 15:47:11 +0000 (15:47 +0000)
* commit '204b4157b3fdbeea8859c4ad0e29be18d74e6f5f':
  Use _WIN32 rather than HAVE_WINSOCK.

1  2 
libs/androidfw/ResourceTypes.cpp

Simple merge