| commit | 7d785aafc130a43cabb0f960166b6a6260e59669 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri Feb 07 22:35:09 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 07 22:35:09 2014 +0000 |
| tree | 149b3b95a5bfced4f0ba803d6af11c794b640852 | |
| parent | 5fba60a8761b28adec2704dcbf69376ebde4f19b [diff] | |
| parent | a5df8e122f4f322d9d1d4e9c14bf998ff2e3406a [diff] |
am a5df8e12: Merge "Accept takes a socklen_t, not an int." * commit 'a5df8e122f4f322d9d1d4e9c14bf998ff2e3406a': Accept takes a socklen_t, not an int.