OSDN Git Service

Merge "Add a setHandshakeTimeout() to OpenSSLSocketImpl, which sets a read timeout...
authorDan Egnor <egnor@google.com>
Wed, 10 Feb 2010 22:32:15 +0000 (14:32 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 10 Feb 2010 22:32:15 +0000 (14:32 -0800)
commitecbfbb2f03ec017b157c7b893e16055b2e445edf
treed43e7424f8dc0252e7ea76141dcec4d14dae0dd2
parent5cbd2cbe57923225054842e95944e1461a2c573d
parent756a4c5898f84f8bc4a93bbb7d569536b01f9199
Merge "Add a setHandshakeTimeout() to OpenSSLSocketImpl, which sets a read timeout that only applies to the SSL handshake step."