Merge commit '2fbfe0b3a17964577657d5b099d75f037d879d66'
* commit '2fbfe0b3a17964577657d5b099d75f037d879d66':
Plumb send-message status callbacks from service
Merge commit '972bca2e164d32d33040d09021d23ee81d1ec889'
* commit '972bca2e164d32d33040d09021d23ee81d1ec889':
Update unread count of outbox when messages are sent.
Merge commit '76d1a8a567d0d792544c19a76f992e89715bc499'
* commit '76d1a8a567d0d792544c19a76f992e89715bc499':
Delete attachments for mailboxes/messages deleted by server
Merge commit '2216e1e4f9a25e8ee661a3db78cb21522d90a1a4'
* commit '2216e1e4f9a25e8ee661a3db78cb21522d90a1a4':
Delete attachments when necessary, don't leak disk space
Merge commit 'd662900b561a12fe424a1e33d8a9008624742b6f'
* commit 'd662900b561a12fe424a1e33d8a9008624742b6f':
Throttle the refresh of the message list as it changes (fixes#2126515)
Merge commit '286313b476a3a59c2f5adb9c6b86b8d641e73c31'
* commit '286313b476a3a59c2f5adb9c6b86b8d641e73c31':
Fix problem in which email/phone #'s could get erased erroneously
Merge commit '8d0958c8ae362521f7e796eddaf2d39d4469d089'
* commit '8d0958c8ae362521f7e796eddaf2d39d4469d089':
Fix problem that could prevent push from working
Merge commit 'af6025191133c13a1aff5db093a17d0a536178d5'
* commit 'af6025191133c13a1aff5db093a17d0a536178d5':
Fix mail sending for new message (#2158054)
Merge commit 'cb7e4db7382e7a901426ee4b11bded672bad703d'
* commit 'cb7e4db7382e7a901426ee4b11bded672bad703d':
Use built-in rows for Birthday and OfficeLocation (fixes#2154423)
Merge commit '1ccf74acd449114bdee781a40630c5c96291670d'
* commit '1ccf74acd449114bdee781a40630c5c96291670d':
Fix an issue related to ping loop errors and ping state; add logging
Merge commit '922a67a6d0f6c3fa4b00d66acc34f7d40440f12a'
* commit '922a67a6d0f6c3fa4b00d66acc34f7d40440f12a':
Make sure intro text is saved/restored properly (fix#2155286)
Merge commit 'e6978614dad3bd63dca96b80bcc1261e08659cc5'
* commit 'e6978614dad3bd63dca96b80bcc1261e08659cc5':
Use FLAG_ACTIVITY_CLEAR_TOP for list activities
Merge commit 'c5f284963e4df2e783e288375d82ffc8b891453e'
* commit 'c5f284963e4df2e783e288375d82ffc8b891453e':
Fix the bug that combined Drafts folder is hidden when there are only read messages.
Merge commit '236e30852230a01d2af604059ab3d5e9e11d4871'
* commit '236e30852230a01d2af604059ab3d5e9e11d4871':
MessageCompose: fix unit tests that were broken by CL 27435.
Merge commit '86241e23e4b4c96e100c394c5117b02d12eadf18'
* commit '86241e23e4b4c96e100c394c5117b02d12eadf18':
Update unread counts and default sender Id in AccountFolderList after folder loding messages
Merge commit 'f9ccc0ba88e00c4175f6720aca07876d50b9f22f' into eclair-plus-aosp
* commit 'f9ccc0ba88e00c4175f6720aca07876d50b9f22f':
Plumb send-message status callbacks from service
* Make sure service callbacks are installed
* Route from service sent-message callback to controller results
This sends the callback information back to listeners who care about
sent messages. Note, due to impedance mismatch between the service
and the controller, this should not be used for much more than an
indication that outbox status has changed.
Bug # 2158497
Change-Id: I8d013d97ef53dcca85216f9b8c027ba3917c1e85
* Removed obsolete "delete after 7 days" option from pop-up prefs
* Mark deleted message sentinels as "read" so they don't contribute
to unread counts.
Bug # 2157487 and Bug # 2159278
Change-Id: Ic3cbc51d6f5ede2eb923e2d0e5c0dfee377764f5
Merge commit '4f81086e34c4f28d78d516461f525321109d4804' into eclair-plus-aosp
* commit '4f81086e34c4f28d78d516461f525321109d4804':
Update unread count of outbox when messages are sent.
Merge commit 'cdd477e16a82417fb924abc42a2a834c29fb0db8' into eclair-plus-aosp
* commit 'cdd477e16a82417fb924abc42a2a834c29fb0db8':
Delete attachments for mailboxes/messages deleted by server
