| commit | 8f1c82c697aeb774f63153b66c45d7dea43e4dbe | [log] [tgz] |
|---|---|---|
| author | Sreeram Ramachandran <sreeram@google.com> | Wed May 14 19:51:38 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 14 19:51:38 2014 +0000 |
| tree | d4983ba75c24c76241966456d24bbda1a586f926 | |
| parent | 5bd06936e736c1fe029e929f9d3c22b0d31e0240 [diff] | |
| parent | 56935417ceac36ea411b1489e08fec64d188bd79 [diff] |
am 56935417: am f03397fa: Merge changes If5359c26,I5d09be41 * commit '56935417ceac36ea411b1489e08fec64d188bd79': Use a function instead of a macro. Mark sockets on accept().