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.
tree: 4296f4d50fa19adc964481d952885752b16f072a
  1. camera/
  2. cmds/
  3. include/
  4. media/
  5. services/