tree 21e851c3343aa5f6705be0832b0ca6f5271cc126
parent 4f62331412166800be75b44630b7514d342a0b50
parent 2d3125be91080f1a883665d201447085c66227e4
author Lorenzo Colitti <lorenzo@google.com> 1391470677 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1391470677 +0000

am 2d3125be: Merge "Test both recvfrom() and read() in PingTest."

* commit '2d3125be91080f1a883665d201447085c66227e4':
  Test both recvfrom() and read() in PingTest.