tree 6cc0b20da1cc2d9951ca7bfd74c6cd4142dff956
parent 171cd0678008a48ce281f2f9b631108bc27dbefd
parent 4124f4a40e1fef90df0dec243ecd9bcdbb911738
author Paul Westbrook <pwestbro@google.com> 1354212470 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354212470 -0800

am 4124f4a4: Merge "Specify a timeout for the connection handshake" into jb-mr1.1-dev

* commit '4124f4a40e1fef90df0dec243ecd9bcdbb911738':
  Specify a timeout for the connection handshake