| commit | d8b50fec84bf7ff0de79fd983fff651772a30caf | [log] [tgz] |
|---|---|---|
| author | Sreeram Ramachandran <sreeram@google.com> | Wed May 14 20:00:07 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 14 20:00:07 2014 +0000 |
| tree | 2886f2ce26a493d1f7f2890baa5cc75d20cc02f1 | |
| parent | d6f34c8aefd72dc2ccedfd803966d5a55f37a101 [diff] | |
| parent | 8f1c82c697aeb774f63153b66c45d7dea43e4dbe [diff] |
am 8f1c82c6: am 56935417: am f03397fa: Merge changes If5359c26,I5d09be41 * commit '8f1c82c697aeb774f63153b66c45d7dea43e4dbe': Use a function instead of a macro. Mark sockets on accept().