tree 02a38a349f6e5b97eb31a53d23bad588b7090ff1
parent 830f25c8b6e581800fcba484d3a967fc3cd9366e
parent 2c39c50ac0222fa16732e261a6b9eced07079211
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.