tree bab1cd93c40f53e1648bfca6e8ededd8cc11f17c
parent f211ed5e4284c9443ecb8696935df635302e2dd2
parent 2db8a06adbc36cd162e1aa212f2796c08dfbe207
author Andreas Huber <andih@google.com> 1365105794 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365105794 -0700

am 2db8a06a: am 8f2f7b33: Merge "New nettest, a simple TCP connection test to measure" into jb-mr2-dev

* commit '2db8a06adbc36cd162e1aa212f2796c08dfbe207':
  New nettest, a simple TCP connection test to measure