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