| commit | 9e2cac206053cace2eae385166ca52ad1729d149 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Mon Feb 10 12:51:30 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Feb 10 12:51:30 2014 +0000 |
| tree | f5f538be57ae72935db2261c3393f2dae597e299 | |
| parent | d992104a98d4a37e1e7a4dc6920c8e387fe7138b [diff] | |
| parent | 7d785aafc130a43cabb0f960166b6a6260e59669 [diff] |
am 7d785aaf: am a5df8e12: Merge "Accept takes a socklen_t, not an int." * commit '7d785aafc130a43cabb0f960166b6a6260e59669': Accept takes a socklen_t, not an int.