tree 639c869895a88c588f732da2b8c3b537ad22143c
parent 6d65c2cb18ac0de361ee433739f354a2a63ec943
parent a951e74897193848ee88ed1c5b0a1d536f403d70
author Narayan Kamath <narayan@google.com> 1418033572 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418033572 +0000

am a951e748: Fix failing socket tests.

* commit 'a951e74897193848ee88ed1c5b0a1d536f403d70':
  Fix failing socket tests.