tree 8c8528836998d8f66c211a3ccb312e933b3236c4
parent 0fe09fd76946668edd4b0a41d891b7bec566de86
parent 8fbc09bde8c5723d57a3b188e7fc69916cc62cca
author Neil Fuller <nfuller@google.com> 1435978722 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1435978722 +0000

am 42070100: am 5df46622: Merge "More tests for LocalSocket"

* commit '42070100bedf08b4d1622403b733abcbcd3b07a1':
  More tests for LocalSocket