tree 9cbf850411ba4130d98cc7e8115fa15919180565
parent 7f9219281e0ac6b35e5d557104f0de9ebbb66641
parent 30c168c570deb48f5ad0de0821f2fea0d149a635
author Narayan Kamath <narayan@google.com> 1424514479 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424514479 +0000

am 30c168c5: am ae25aed3: am 940632f1: Merge "Remove references to __CYGWIN__ and HAVE_WINSOCK2_H."

* commit '30c168c570deb48f5ad0de0821f2fea0d149a635':
  Remove references to __CYGWIN__ and HAVE_WINSOCK2_H.