tree 6cc0b20da1cc2d9951ca7bfd74c6cd4142dff956
parent 3ebd1b038bd494f4356c7df9020ac6f7f9f50cbb
parent 36bcc2e29ab36ae3626443bd12ad173b0ed08808
author Paul Westbrook <pwestbro@google.com> 1354228066 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354228066 -0800

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

* commit '36bcc2e29ab36ae3626443bd12ad173b0ed08808':
  Specify a timeout for the connection handshake