| commit | 36bcc2e29ab36ae3626443bd12ad173b0ed08808 | [log] [tgz] |
|---|---|---|
| author | Paul Westbrook <pwestbro@google.com> | Thu Nov 29 10:07:50 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 29 10:07:50 2012 -0800 |
| tree | 6cc0b20da1cc2d9951ca7bfd74c6cd4142dff956 | |
| parent | 171cd0678008a48ce281f2f9b631108bc27dbefd [diff] | |
| parent | 4124f4a40e1fef90df0dec243ecd9bcdbb911738 [diff] |
am 4124f4a4: Merge "Specify a timeout for the connection handshake" into jb-mr1.1-dev * commit '4124f4a40e1fef90df0dec243ecd9bcdbb911738': Specify a timeout for the connection handshake