Merge commit 'ffc681a4da85c82c80d819ab8afb4442577c52a0' into eclair-plus-aosp
* commit 'ffc681a4da85c82c80d819ab8afb4442577c52a0':
Handle the case of no body being present (happens in unit tests)
Merge commit '3bef61019605176b3397b5ae659205ac324689ed' into eclair-plus-aosp
* commit '3bef61019605176b3397b5ae659205ac324689ed':
change to use the new CALLER_IS_SYNCADAPTER flag
Merge commit 'd2174733b146eeccd5f3b3b95f98e1e1aaafb257' into eclair-plus-aosp
* commit 'd2174733b146eeccd5f3b3b95f98e1e1aaafb257':
Auto-sync of stale mailboxes
Merge commit '043dba5e1b79037f438483f32108aa348d0f0ad6' into eclair-plus-aosp
* commit '043dba5e1b79037f438483f32108aa348d0f0ad6':
Enable long press Open on Accounts screen
* SmartForward and SmartReply are EAS commands that automatically
include the original message and, if a forward, all original
attachments, regardless of whether they've been downloaded to
the device
* Both commands improve battery life by sending less data; greatly
so for SmartForward if there are attachments
Change-Id: I12432cd5275a3b54e9a80d5cd59da437c4a086cc
Merge commit '42c130dcf1f6163b75b7d75ab66027c27d7c5422' into eclair-plus-aosp
* commit '42c130dcf1f6163b75b7d75ab66027c27d7c5422':
Fix bug in which EAS mail won't ever get sent (#2118279)
Merge commit 'e59c8725c595ae21dff5e04dc418818a18555a55' into eclair-plus-aosp
* commit 'e59c8725c595ae21dff5e04dc418818a18555a55':
Make sure SyncManager keeps running in various edge cases
* Have Welcome start the service (in case the app has been reloaded)
* Have SyncManager.ping start the service if there's no instance of
SyncManager
Change-Id: I8bed2843a3e065d2db29fad67dfb0bb3a5d0ff5e
Merge commit 'd60909418221d8b7f762c11d8322a98f0952dca7' into eclair-plus-aosp
* commit 'd60909418221d8b7f762c11d8322a98f0952dca7':
Improve the checkMailbox loop query to get only the appropriate boxes
Merge commit 'bba6d443f55a361a682ffc2a84c7809f4b894e94' into eclair-plus-aosp
* commit 'bba6d443f55a361a682ffc2a84c7809f4b894e94':
Don't wait longer than 10s for ping boxes to be ready
Merge commit '403a45e73606f3d41624c3e3ac02597c08145281' into eclair-plus-aosp
* commit '403a45e73606f3d41624c3e3ac02597c08145281':
Reimplement reply/forward to use mTextReply/mHtmlReply
* Do a short ping in this case, which at least will allow the device
to sleep while waiting
* Addresses #2116749
Change-Id: I9e70feaeef1361e1d66652dc66b92f6ee14751bf
* Move creation of final reply/forward text (i.e. new text plus
the original) to Rfc822Output, where it belongs.
* Prepares the way for use of SmartForward/SmartReply in
Exchange and replying w/ multipart/alternative in SMTP
* Moved test from MessageCompose to new Rfc822OutputTests, and note
that new tests should be added (this is not a regression; there
were never enough tests here)
Change-Id: Ibefb842f47cc9223714856d99b8d4f55b55f49e3
Merge commit '492228bdc4b90c632d7cf4d87a81fa42d3c3456f' into eclair-plus-aosp
* commit '492228bdc4b90c632d7cf4d87a81fa42d3c3456f':
Don't sync if the "Sync Contacts" checkbox isn't set
Merge commit 'e13ff84df7877e447a33136e328813b3ee0e5140' into eclair-plus-aosp
* commit 'e13ff84df7877e447a33136e328813b3ee0e5140':
Fix leaked intent receiver by using onStartCommand in SyncManager
* Also remove some logging and correct some erroneous logging
* Fix the backoff behavior on IOException
Change-Id: I5fb5a0bf73eaa681eb7b9c305c838e78e7ba88ab
Merge commit '3c7f0d4c000f24e39fb4b0f1e10f762f5ff011c9' into eclair-plus-aosp
* commit '3c7f0d4c000f24e39fb4b0f1e10f762f5ff011c9':
Make exchange contact category names visible; also their members
Merge commit '86ada729c2930c278c4f73a6bcea059c8ac74559' into eclair-plus-aosp
* commit '86ada729c2930c278c4f73a6bcea059c8ac74559':
Check for null data before writing contact rows to server
