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