tree 3c69249c4a7bea5def8b0c9b24576b3dbf72cca2
parent 0002a85f8b94d96b9b86819bd33fdfd7cfe74080
parent f99dfdb5044ed6b120a8f2a86ddf2dd92a5bb9a2
author Jean-Baptiste Queru <jbq@google.com> 1372793675 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1372793675 -0700

am f99dfdb5: Merge "vold: fix potential socket leak"

* commit 'f99dfdb5044ed6b120a8f2a86ddf2dd92a5bb9a2':
  vold: fix potential socket leak