tree 3165a2d5d54e8fc0987a5beb011471f4b6a09cb3
parent 1507c7ce4fc88f7bdf5e89ba10839809693eeefb
parent 0c0cfd5ce4a26187fb910ba701d0021989103a25
author Lorenzo Colitti <lorenzo@google.com> 1254370599 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1254370599 -0700

am 0c0cfd5c: Merge change I96cd6f5b into eclair

Merge commit '0c0cfd5ce4a26187fb910ba701d0021989103a25' into eclair-plus-aosp

* commit '0c0cfd5ce4a26187fb910ba701d0021989103a25':
  Make the socket test accept ::1 as a valid result for