Merge commit '5024030e89812c77ae835accd7c2a652a0af7a88'
* commit '5024030e89812c77ae835accd7c2a652a0af7a88':
Don't sync if the "Sync Contacts" checkbox isn't set
Merge commit '047d1ae60af1a875eb54723b1f18722c2f67852c'
* commit '047d1ae60af1a875eb54723b1f18722c2f67852c':
Fix leaked intent receiver by using onStartCommand in SyncManager
Merge commit 'bb1b993808f295dc0d6c850a7d1b08b6f8846a34'
* commit 'bb1b993808f295dc0d6c850a7d1b08b6f8846a34':
Make exchange contact category names visible; also their members
Merge commit '403a45e73606f3d41624c3e3ac02597c08145281' into eclair-plus-aosp
* commit '403a45e73606f3d41624c3e3ac02597c08145281':
Reimplement reply/forward to use mTextReply/mHtmlReply
* 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 '013b84dab8d736da21e9103c686e2dbcc30657b7'
* commit '013b84dab8d736da21e9103c686e2dbcc30657b7':
Check for null data before writing contact rows to server
Merge commit '86ada729c2930c278c4f73a6bcea059c8ac74559' into eclair-plus-aosp
* commit '86ada729c2930c278c4f73a6bcea059c8ac74559':
Check for null data before writing contact rows to server
Merge commit 'be60dfdee7c2c0f73d54e1b04a36967508d428ae' into eclair-plus-aosp
* commit 'be60dfdee7c2c0f73d54e1b04a36967508d428ae':
Update MessageListView to fit punchcut's design
BUG:1904421
* update READ/UNREAD indications
** don't change color chip
** change background color
* Change Date
* Change the position of attachement icon
* Change menu icon for folder
Merge commit '51b635f2d2ff4d443a7e1d46be7394bf056b9f36' into eclair-plus-aosp
* commit '51b635f2d2ff4d443a7e1d46be7394bf056b9f36':
Fix spinny position in the title bar
* Edit Controller.deleteMessage() to handle both cases
* Refactored to start from processPendingActionsSynchronous() and
dispatch to series of smaller methods to handle deletes vs. updates
and the details of the various specific operations.
* Added processPendingDeletesSynchronous() which looks for delete-from-
trash and does the right thing locally and/or remotely.
Fixes bug # 1811026
Merge commit '6c6d7e3a260a5906afa3a0fbe9700a0b58046420' into eclair-plus-aosp
* commit '6c6d7e3a260a5906afa3a0fbe9700a0b58046420':
Fix sync-crashing bug in exchange contact groups
