am 7a8bbfe0: am 4b59cfc8: Fix problem with timeouts and sending attachments (#2178288)

Merge commit '7a8bbfe0b07a111d8e77fe05165575deed9bb4b6' into eclair-mr2-plus-aosp

* commit '7a8bbfe0b07a111d8e77fe05165575deed9bb4b6':
This commit is contained in:
Marc Blank 2009-10-09 12:47:59 -07:00 committed by Android Git Automerger
commit ae968df16d

Diff Content Not Available