OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e528f04 f8a6a2f)
am f8a6a2f6: Merge "Use _WIN32 rather than HAVE_WINSOCK."
authorElliott Hughes <enh@google.com>
Thu, 30 Jul 2015 15:32:51 +0000 (15:32 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 30 Jul 2015 15:32:51 +0000 (15:32 +0000)
* commit 'f8a6a2f602ad4ec049b2d2d4741571a76c3d014b':
  Use _WIN32 rather than HAVE_WINSOCK.


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help