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

Merge commit 'ae968df16d331f5bb38b5a861eabf563b032e4fd'

* commit 'ae968df16d331f5bb38b5a861eabf563b032e4fd':
This commit is contained in:
Marc Blank 2009-10-13 16:52:29 -07:00 committed by Android Git Automerger
commit 18d8b83986

Diff Content Not Available