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