tree 92d1cc5e335ecaa976d753c711ddfc62bc0d1745
parent f27b4193e37af4dbe983618f5a07473b7d70ccee
parent 0f7e3bb45f03a1b54cc1d6c0b9df608d9607f24d
author Elliott Hughes <enh@google.com> 1363826761 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363826761 -0700

am 0f7e3bb4: Merge "Add support for Unix domain sockets."

* commit '0f7e3bb45f03a1b54cc1d6c0b9df608d9607f24d':
  Add support for Unix domain sockets.