OSDN Git Service

am 204b4157: am f8a6a2f6: Merge "Use _WIN32 rather than HAVE_WINSOCK."
authorElliott Hughes <enh@google.com>
Thu, 30 Jul 2015 15:46:55 +0000 (15:46 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 30 Jul 2015 15:46:55 +0000 (15:46 +0000)
commitd065fd415cf02c25dd80a01a12fbafb0b20cd08b
tree41a984fd0aa9d7a857f1a1914930d6a057ede3d6
parent0c152b9e8424bdcbf558391ad40d2ca4fea9f62a
parent204b4157b3fdbeea8859c4ad0e29be18d74e6f5f
am 204b4157: am f8a6a2f6: Merge "Use _WIN32 rather than HAVE_WINSOCK."

* commit '204b4157b3fdbeea8859c4ad0e29be18d74e6f5f':
  Use _WIN32 rather than HAVE_WINSOCK.
libs/androidfw/ResourceTypes.cpp