| commit | 87d0f45b3c30dff02bd92f542e5e9e64816f5315 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue May 20 00:00:09 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 20 00:00:09 2014 +0000 |
| tree | 62c6482d298dcd2e6043998f298d3b2c5bba10f8 | |
| parent | b42f141315ae0929325335645d397db04a500c88 [diff] | |
| parent | 2dea56e05c45c1a16232152dec239c2506ab6d97 [diff] |
am 2dea56e0: am 9e0a6248: Merge "Fix Windows socket_network_client.c build failures." * commit '2dea56e05c45c1a16232152dec239c2506ab6d97': Fix Windows socket_network_client.c build failures.