Merge commit 'f6fda92606ee81b8116270da780d053293c9b575'
* commit 'f6fda92606ee81b8116270da780d053293c9b575':
Help with another push inconsistency edge case (#2131432)
Merge commit '5b2a84472ea71906677c91bd5e154df89c967282'
* commit '5b2a84472ea71906677c91bd5e154df89c967282':
Use constants for elements in projections.
Merge commit '54ac1169103658689526063a012fdce59bd50dd6'
* commit '54ac1169103658689526063a012fdce59bd50dd6':
Handle change from push to other intervals properly (#2165032)
Merge commit '84ae53c85014715f9852438305a628824d27dce4'
* commit '84ae53c85014715f9852438305a628824d27dce4':
MessageCompose: allow sending email when started through external intent.
Merge commit '1cd5e5f03cc2f707ddfd46d439e6991db7454ab8' into eclair-plus-aosp
* commit '1cd5e5f03cc2f707ddfd46d439e6991db7454ab8':
Import revised translations. DO NOT MERGE
Merge commit 'e1b5e8574c86e4dcc184f1b3a4db352c9a631d99' into eclair-plus-aosp
* commit 'e1b5e8574c86e4dcc184f1b3a4db352c9a631d99':
Help with another push inconsistency edge case (#2131432)
Merge commit '85d718cb0735de9069673fbf9834fa64459c2178' into eclair-plus-aosp
* commit '85d718cb0735de9069673fbf9834fa64459c2178':
MessageCompose: quote plain-text body if available, otherwise quote HTML body.
Merge commit '1ef86a50f8f6bf09cb031359c1d7cf0902c4a441' into eclair-plus-aosp
* commit '1ef86a50f8f6bf09cb031359c1d7cf0902c4a441':
MessageView: scroll to (0,0) on message change.
Merge commit 'f71577e9cb81d3681b0e3a3b4a52494c98be8870' into eclair-mr2-plus-aosp
* commit 'f71577e9cb81d3681b0e3a3b4a52494c98be8870':
Import revised translations. DO NOT MERGE
Merge commit 'd493ba257a1632a8de578e06a7df7ed311227887' into eclair-plus-aosp
* commit 'd493ba257a1632a8de578e06a7df7ed311227887':
Avoid NPE at onRefresh in MessageList
Merge commit '8647be095a75a25df98487d6e908a94f2d6fb076' into eclair-plus-aosp
* commit '8647be095a75a25df98487d6e908a94f2d6fb076':
Correct issue with mail change parsing (fixes#2165649)
Merge commit '1cd5e5f03cc2f707ddfd46d439e6991db7454ab8' into eclair-mr2
* commit '1cd5e5f03cc2f707ddfd46d439e6991db7454ab8':
Import revised translations. DO NOT MERGE
Merge commit '888ea64f86e518de18806ef85bc7c16ba29f72f6' into eclair-plus-aosp
* commit '888ea64f86e518de18806ef85bc7c16ba29f72f6':
Handle change from push to other intervals properly (#2165032)
Some IMAP servers return NIL if you BODY.PEEK[TEXT] a messsage with
no body, instead of the more canonical {0}CRLF. Instead of messing with the
parser to deal with that, it makes more sense not to try and fetch empty
bodies. So there are three changes:
* Don't fetch parts when size = 0
* Don't append "null" when there is null body text
* Slight change to attachment handling so size is reported >0
* Unit tests on some of the related lower-level protocol stuff
Bug http://b/issue?id=2160387
Change-Id: Ifb8fb0ed5ce7297908e1ae8d5a02dda5975c4a3c
Merge commit 'ba7decd89de39d3ed8d27e8e0e48ad517b435190' into eclair-plus-aosp
* commit 'ba7decd89de39d3ed8d27e8e0e48ad517b435190':
MessageCompose: allow sending email when started through external intent.
Merge commit '2787f001fb4b0341cc9949bffde62075b7c68b39' into eclair-plus-aosp
* commit '2787f001fb4b0341cc9949bffde62075b7c68b39':
Import revised translations. DO NOT MERGE
Merge commit 'a39b643d79180ab8f91aa4b1ae28d0b0b768834e' into eclair-mr2-plus-aosp
* commit 'a39b643d79180ab8f91aa4b1ae28d0b0b768834e':
Help with another push inconsistency edge case (#2131432)
Merge commit 'e1b5e8574c86e4dcc184f1b3a4db352c9a631d99' into eclair-mr2
* commit 'e1b5e8574c86e4dcc184f1b3a4db352c9a631d99':
Help with another push inconsistency edge case (#2131432)
