tree 53755e7763b3cb751db8dfb08e40a4687d45520d
parent bd9acc2218fcf3cd6605554a45db2251753ddd7b
parent 62bac75d677de5398b48487e758dcbdf7bc9d834
author Dave Platt <dplatt@google.com> 1389124392 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1389124392 -0800

am 62bac75d: am 76e5ca81: Fix descriptor leak after accepting connections

* commit '62bac75d677de5398b48487e758dcbdf7bc9d834':
  Fix descriptor leak after accepting connections