OSDN Git Service

Merge "We accidentally always aborted after 10 secs, even if the connection was fine...
authorAndreas Huber <andih@google.com>
Fri, 27 Aug 2010 20:44:07 +0000 (13:44 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 27 Aug 2010 20:44:07 +0000 (13:44 -0700)

Trivial merge