tree 4296f4d50fa19adc964481d952885752b16f072a
parent 95fd60f5f34ef63a9dbb12707c5c9cc771367565
parent 165dc4c486b8511402b3be508d5a577a774cdf59
author Andreas Huber <andih@google.com> 1282941974 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282941974 -0700

am e250c220: Merge "We accidentally always aborted after 10 secs, even if the connection was fine." into gingerbread

Merge commit 'e250c220d1bb3bd117641add94ee7465a82f085c' into gingerbread-plus-aosp

* commit 'e250c220d1bb3bd117641add94ee7465a82f085c':
  We accidentally always aborted after 10 secs, even if the connection was fine.