| commit | 5c6843b6be0f34594c7134d2efd292d1c1cf4448 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri Jan 09 22:07:07 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 09 22:07:07 2015 +0000 |
| tree | fd454d92e461b41e29d0133c89afb777cba85f9e | |
| parent | 837195a7cb6fefe922570aedfa55863d8d721d87 [diff] | |
| parent | 55410c4e62c478a5a85f428f28dbeab4a5c908d9 [diff] |
am 55410c4e: am 4c6c6d1c: Merge "You either have winsock or <sys/sockets.h>." * commit '55410c4e62c478a5a85f428f28dbeab4a5c908d9': You either have winsock or <sys/sockets.h>.