| commit | 62090bb6b9b3a38820dfd758ffccf0e94a3eb943 | [log] [tgz] |
|---|---|---|
| author | Sreeram Ramachandran <sreeram@google.com> | Wed May 14 19:51:36 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 14 19:51:36 2014 +0000 |
| tree | 616f6898c6378880304cb4fbfe21e2dc4b8140ee | |
| parent | c1a5bc96fb84a16dc1f4cae7919413be2b3912f0 [diff] | |
| parent | d2ac8787496422ee70e44f6e5abf65b570015470 [diff] |
am d2ac8787: am 49ec2a0c: Merge "Mark sockets on accept()." * commit 'd2ac8787496422ee70e44f6e5abf65b570015470': Mark sockets on accept().