tree 6cc0b20da1cc2d9951ca7bfd74c6cd4142dff956
parent 978959e6199410419792e89fcea16413f56aeb12
parent 397cce4229eb90a6582e1e5b7ce153536a986627
author Paul Westbrook <pwestbro@google.com> 1354212340 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1354212340 -0800

Merge "Specify a timeout for the connection handshake" into jb-mr1.1-dev