Merge commit '69ee7c0210f5adec205906c3c3ea3ed698a376f7'
* commit '69ee7c0210f5adec205906c3c3ea3ed698a376f7':
Controller: modify the test for "attachment already loaded".
Merge commit '9abd1bf9dabbf5f55b0f84a61d61b031250154bc' into eclair-mr2-plus-aosp
* commit '9abd1bf9dabbf5f55b0f84a61d61b031250154bc':
Controller: modify the test for "attachment already loaded".
Merge commit 'ce81062d3e3a68181101cf12379fb79a3122b1e6'
* commit 'ce81062d3e3a68181101cf12379fb79a3122b1e6':
MessageView: center the presence dot with the From text.
Merge commit '3126629db5bfb2c2ae089913b96b9e0657694be9' into eclair-mr2-plus-aosp
* commit '3126629db5bfb2c2ae089913b96b9e0657694be9':
MessageView: center the presence dot with the From text.
Merge commit 'a62525a3650ab32b71a8bea520127141e09522b3'
* commit 'a62525a3650ab32b71a8bea520127141e09522b3':
Go to combined inbox on notify for 2+ accounts (#2147265) DO NOT MERGE
Merge commit 'cbfb39b8cc955e1771756a817db53eccd4d8e227'
* commit 'cbfb39b8cc955e1771756a817db53eccd4d8e227':
Server validates even though server address is wrong DO NOT MERGE
Merge commit '8df4528248e6dc72a7a63732c34c4246eddba937' into eclair-mr2-plus-aosp
* commit '8df4528248e6dc72a7a63732c34c4246eddba937':
Go to combined inbox on notify for 2+ accounts (#2147265) DO NOT MERGE
Merge commit '5ce592f4b250b2649757192358722a1ce49a3775' into eclair-mr2-plus-aosp
* commit '5ce592f4b250b2649757192358722a1ce49a3775':
Server validates even though server address is wrong DO NOT MERGE
Merge commit '0054c1a9e699e5c90daed6fd0a30ffc8aec3955e' into eclair-mr2
* commit '0054c1a9e699e5c90daed6fd0a30ffc8aec3955e':
Go to combined inbox on notify for 2+ accounts (#2147265) DO NOT MERGE
Merge commit '2533132c84b9721b9692b284bbb14e5e0d237237' into eclair-mr2
* commit '2533132c84b9721b9692b284bbb14e5e0d237237':
Server validates even though server address is wrong DO NOT MERGE
Merge commit 'bb17f149abe263b36eaab1125e12ea266a60306a' into eclair-plus-aosp
* commit 'bb17f149abe263b36eaab1125e12ea266a60306a':
Import revised translations. DO NOT MERGE
Merge commit '0054c1a9e699e5c90daed6fd0a30ffc8aec3955e' into eclair-plus-aosp
* commit '0054c1a9e699e5c90daed6fd0a30ffc8aec3955e':
Go to combined inbox on notify for 2+ accounts (#2147265) DO NOT MERGE
Merge commit '2533132c84b9721b9692b284bbb14e5e0d237237' into eclair-plus-aosp
* commit '2533132c84b9721b9692b284bbb14e5e0d237237':
Server validates even though server address is wrong DO NOT MERGE
* The problem is that PendingIntents aren't updated when a notification
is updated, so the changed extras when a 2nd account gets a new message
aren't seen by MessageList when it's started up upon tapping the
notification (it uses the extras from the 1st account to get a new
message)
* The fix is to use the newish (cupcake) flag in the PendingIntent that
causes the extras in the PendingIntent to be updated
Change-Id: If12d0e7c6d3f256befeca98b560443395820737f
* Fixes#2173664
* Make sure that not only is the OPTIONS command accepted, but that
the server reports EAS versions and commands
Change-Id: Ic29d3eacfdc54d107600afc443964a1e8b3d5e59
* An Exchange log from Moto has shown sync behavior in which moreAvailable
is set to true even though there are no changes in the sync response
(i.e. the SyncKey is unchanged)
* This leads to long-lived looping which impacts battery life
* The fix is to recognize the behavior and prevent looping by
setting moreAvailable = false
Change-Id: Icf45efbc24331c874c820b7b177e39b16df445d8
Merge commit '9ccda56cb30e665cc84810c10f5dbb3b4b78ceff' into eclair-mr2-plus-aosp
* commit '9ccda56cb30e665cc84810c10f5dbb3b4b78ceff':
Import revised translations. DO NOT MERGE
Merge commit 'ba2d6de4b706cd226d0eb7910fef7ec77866d831' into eclair-mr2
* commit 'ba2d6de4b706cd226d0eb7910fef7ec77866d831':
Import revised translations. DO NOT MERGE
Merge commit 'a06961dbacce690eab48076bc05ab59a7b2d938c'
* commit 'a06961dbacce690eab48076bc05ab59a7b2d938c':
Go to combined inbox from notification for 2+ accounts (#2147265)
Merge commit 'da08e3bcb6dc83409f136b5e80e1ce1ab2925936' into eclair-mr2-plus-aosp
* commit 'da08e3bcb6dc83409f136b5e80e1ce1ab2925936':
Fix timing-dependent crash in Medium tests (#2202726)
Merge commit 'd16b4b921fef0a79a12fd90a5fad353413ba80ea' into eclair-mr2-plus-aosp
* commit 'd16b4b921fef0a79a12fd90a5fad353413ba80ea':
Go to combined inbox from notification for 2+ accounts (#2147265)
* The problem is that PendingIntents aren't updated when a notification
is updated, so the changed extras when a 2nd account gets a new message
aren't seen by MessageList when it's started up upon tapping the
notification (it uses the extras from the 1st account to get a new
message)
* The fix is to use the newish (cupcake) flag in the PendingIntent that
causes the extras in the PendingIntent to be updated
Change-Id: Ia4ab14954b2c1413526016975216b2516372f2aa
Merge commit 'ba2d6de4b706cd226d0eb7910fef7ec77866d831' into eclair-plus-aosp
* commit 'ba2d6de4b706cd226d0eb7910fef7ec77866d831':
Import revised translations. DO NOT MERGE
Merge commit '2c79dfdeaae0ba312fc7c15f134f55d6f3fd6075'
* commit '2c79dfdeaae0ba312fc7c15f134f55d6f3fd6075':
Add view of all counts in AccountFolderList
Merge commit '3045bb967fa7bd88dc52c332cbeb7ffcd4252fe4' into eclair-mr2-plus-aosp
* commit '3045bb967fa7bd88dc52c332cbeb7ffcd4252fe4':
Add view of all counts in AccountFolderList
Merge commit 'f265a1d21735a15e3707f7922110dd2f7eef8824'
* commit 'f265a1d21735a15e3707f7922110dd2f7eef8824':
Fix SQL for upgrade from ver 6 to ver 7 of Email database
Merge commit '367963639d4291511b7e175a208e2b553aac26c2' into eclair-mr2-plus-aosp
* commit '367963639d4291511b7e175a208e2b553aac26c2':
Fix SQL for upgrade from ver 6 to ver 7 of Email database
