tree c36f5c52cec3bd61b5c7ea9187544c741befbbff
parent e2ffb329440774b5c30b1e30386b9b404aa4051e
parent 89b456da4190576d2c89ad01bd5a7627b0676c2c
author Narayan Kamath <narayan@google.com> 1417774891 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417774891 +0000

am 89b456da: Merge "Fix failing socket tests."

* commit '89b456da4190576d2c89ad01bd5a7627b0676c2c':
  Fix failing socket tests.