| commit | 1eddd3faa4c46e13d445869bf32d5725f5f20f78 | [log] [tgz] |
|---|---|---|
| author | Paul Westbrook <pwestbro@google.com> | Thu Nov 29 14:37:25 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 29 14:37:25 2012 -0800 |
| tree | 377821e0ab41c2a60a6c592bdab31af34a5d321b | |
| parent | b85410d4f28c94564efa9b8e3dc30f966020c9f8 [diff] | |
| parent | 5f48368d159ae0ad3b3b306fce624ba701139ace [diff] |
am 5f48368d: am 36bcc2e2: am 4124f4a4: Merge "Specify a timeout for the connection handshake" into jb-mr1.1-dev * commit '5f48368d159ae0ad3b3b306fce624ba701139ace': Specify a timeout for the connection handshake