tree d4fbd7388eb8068baa07bf1192f456ed6d1d8efc
parent a3026dfbac0f0a56387e1c6771e8ffae0fec926e
parent 5d09126ad1cd10c74e676fb158f1d057a37180b2
author Jean-Baptiste Queru <jbq@google.com> 1372794096 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1372794096 -0700

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

* commit '5d09126ad1cd10c74e676fb158f1d057a37180b2':
  vold: fix potential socket leak