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.
This commit is contained in:
Andreas Huber 2010-08-27 13:46:14 -07:00 committed by Android Git Automerger
commit 56f602bc7d

Diff Content Not Available