| commit | 4124f4a40e1fef90df0dec243ecd9bcdbb911738 | [log] [tgz] |
|---|---|---|
| author | Paul Westbrook <pwestbro@google.com> | Thu Nov 29 10:05:40 2012 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Nov 29 10:05:40 2012 -0800 |
| tree | 6cc0b20da1cc2d9951ca7bfd74c6cd4142dff956 | |
| parent | 978959e6199410419792e89fcea16413f56aeb12 [diff] | |
| parent | 397cce4229eb90a6582e1e5b7ce153536a986627 [diff] |
Merge "Specify a timeout for the connection handshake" into jb-mr1.1-dev