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

Merge commit 'e25e03612e1a2988ed83f24d2658cf0898fd1944'

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

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base