e25e03612e
Merge commit 'e250c220d1bb3bd117641add94ee7465a82f085c' into gingerbread-plus-aosp * commit 'e250c220d1bb3bd117641add94ee7465a82f085c': We accidentally always aborted after 10 secs, even if the connection was fine.