tree 149b3b95a5bfced4f0ba803d6af11c794b640852
parent 5fba60a8761b28adec2704dcbf69376ebde4f19b
parent a5df8e122f4f322d9d1d4e9c14bf998ff2e3406a
author Elliott Hughes <enh@google.com> 1391812509 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1391812509 +0000

am a5df8e12: Merge "Accept takes a socklen_t, not an int."

* commit 'a5df8e122f4f322d9d1d4e9c14bf998ff2e3406a':
  Accept takes a socklen_t, not an int.