tree 616f6898c6378880304cb4fbfe21e2dc4b8140ee
parent deedbebb4ef3dfb14334a95ff5bdff42faa3a70f
parent 49ec2a0cdc56fcd6bdd1b0feea127acfabc076f9
author Sreeram Ramachandran <sreeram@google.com> 1400096890 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400096890 +0000

am 49ec2a0c: Merge "Mark sockets on accept()."

* commit '49ec2a0cdc56fcd6bdd1b0feea127acfabc076f9':
  Mark sockets on accept().