| commit | 5f48368d159ae0ad3b3b306fce624ba701139ace | [log] [tgz] |
|---|---|---|
| author | Paul Westbrook <pwestbro@google.com> | Thu Nov 29 14:27:46 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 29 14:27:46 2012 -0800 |
| tree | 6cc0b20da1cc2d9951ca7bfd74c6cd4142dff956 | |
| parent | 3ebd1b038bd494f4356c7df9020ac6f7f9f50cbb [diff] | |
| parent | 36bcc2e29ab36ae3626443bd12ad173b0ed08808 [diff] |
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