Eric Fischer
8e39b7920c
am ac60d037
: Import revised translations. DO NOT MERGE
...
* commit 'ac60d037d8678f47cb6573c53c0a4cc5f2216687':
Import revised translations. DO NOT MERGE
2011-05-10 12:26:15 -07:00
Eric Fischer
ac60d037d8
Import revised translations. DO NOT MERGE
...
Change-Id: Iabe222dbc443c59a421b3a0e4597e1cf9c85ca5e
2011-05-09 16:57:44 -07:00
Eric Fischer
3d1d9afd50
am a5c3744a
: (-s ours) am b79e9fed
: Import revised translations. DO NOT MERGE
...
* commit 'a5c3744a247e432acf9f571a9dfb55321c4baa1a':
Import revised translations. DO NOT MERGE
2011-04-28 10:26:57 -07:00
Eric Fischer
a5c3744a24
am b79e9fed
: Import revised translations. DO NOT MERGE
...
* commit 'b79e9fed673d22ecb2b1dbc27627acdd1084798a':
Import revised translations. DO NOT MERGE
2011-04-27 15:31:36 -07:00
Eric Fischer
b79e9fed67
Import revised translations. DO NOT MERGE
...
Change-Id: I49c5baca3d3e8e6a3fea1a73bf7aa4f6282eaef3
2011-04-27 13:52:55 -07:00
Eric Fischer
c23f695de5
am ce5828ed
: am 11574724
: (-s ours) Import revised translations. DO NOT MERGE
...
* commit 'ce5828ed38212df654352ae8532dcad42d172de3':
Import revised translations. DO NOT MERGE
2011-04-18 03:18:16 -07:00
Eric Fischer
ce5828ed38
am 11574724
: (-s ours) Import revised translations. DO NOT MERGE
...
* commit '11574724466d0a363b9cd8a99aa4e2f6841aa4a2':
Import revised translations. DO NOT MERGE
2011-04-15 12:44:30 -07:00
Eric Fischer
1157472446
Import revised translations. DO NOT MERGE
...
Change-Id: Ie71335ec0b6f8b728afdd5834b242406e816c22f
2011-04-14 14:02:55 -07:00
Eric Fischer
5255bd6cda
am c7ae9f4b
: Import revised translations. DO NOT MERGE
...
* commit 'c7ae9f4b469aaa4788ddce02ae83db1d0229a9b1':
Import revised translations. DO NOT MERGE
2011-04-06 14:19:32 -07:00
Eric Fischer
c7ae9f4b46
Import revised translations. DO NOT MERGE
...
Change-Id: Ib613c0438c34b07dfdf725a14eda10954f6a183f
2011-04-06 13:49:57 -07:00
Andy Stadler
31d5615373
am d6e4e0c3
: (-s ours) am 6c6f1491
: Merge "DO NOT MERGE - Update version number for GB-MR2 update." into gingerbread
...
* commit 'd6e4e0c3edf2e66ab3b37065544b91f8f5333e3a':
DO NOT MERGE - Update version number for GB-MR2 update.
2011-03-31 16:41:55 -07:00
Andy Stadler
f0764cf319
am 22306fa2
: (-s ours) am 188fb8d6
: Merge "DO NOT MERGE - Clear cached CalendarObservers after Calendar wipe" into gingerbread
...
* commit '22306fa2f569f58ebc8dcc1347eaa9f5cc6a298f':
DO NOT MERGE - Clear cached CalendarObservers after Calendar wipe
2011-03-31 16:41:52 -07:00
Andy Stadler
d6e4e0c3ed
am 6c6f1491
: Merge "DO NOT MERGE - Update version number for GB-MR2 update." into gingerbread
...
* commit '6c6f14919822bb8bf45a40bd66f2514bfaaf70b1':
DO NOT MERGE - Update version number for GB-MR2 update.
2011-03-31 16:33:58 -07:00
Andy Stadler
22306fa2f5
am 188fb8d6
: Merge "DO NOT MERGE - Clear cached CalendarObservers after Calendar wipe" into gingerbread
...
* commit '188fb8d6d6c483fddd94eacbce804c38039efe17':
DO NOT MERGE - Clear cached CalendarObservers after Calendar wipe
2011-03-31 16:33:55 -07:00
Andy Stadler
28107ddadf
am 2daecc7a
: (-s ours) am dc43877b
: Merge "DO NOT MERGE - Don\'t sync messages moved from the sent folder" into gingerbread
...
* commit '2daecc7a54d55177835ab9cfc5a4fde589f35f03':
DO NOT MERGE - Don't sync messages moved from the sent folder
2011-03-30 15:30:17 -07:00
Andy Stadler
4c6f8b55bb
am 8252c305
: (-s ours) am 07a85746
: Merge "DO NOT MERGE - Prevent NPE when account sender name is null" into gingerbread
...
* commit '8252c305993f9a1e78307be989f3947c16c44617':
DO NOT MERGE - Prevent NPE when account sender name is null
2011-03-30 15:30:15 -07:00
Andy Stadler
7bead5e3b8
am 3f8c081d
: (-s ours) am aba60dfb
: Merge "DO NOT MERGE - Fix NPE when trying to open attachments" into gingerbread
...
* commit '3f8c081d2b985915dd6585f4ef13d964bf8580c2':
DO NOT MERGE - Fix NPE when trying to open attachments
2011-03-30 15:30:13 -07:00
Andy Stadler
b9e46a6860
am 4fed8653
: (-s ours) am 064c1870
: Merge "DO NOT MERGE - Fix NPE in pop3 checkcapabilities" into gingerbread
...
* commit '4fed865309b1f601e61ece38caa3fd4c622eb928':
DO NOT MERGE - Fix NPE in pop3 checkcapabilities
2011-03-30 15:30:11 -07:00
Andy Stadler
7b62ac1845
am 07eb4bdc
: (-s ours) am 8f0a79c2
: DO NOT MERGE - Add 55 roadrunner email setups
...
* commit '07eb4bdc018888e018163da901a54dd15f65671c':
DO NOT MERGE - Add 55 roadrunner email setups
2011-03-30 15:30:07 -07:00
Andy Stadler
2daecc7a54
am dc43877b
: Merge "DO NOT MERGE - Don\'t sync messages moved from the sent folder" into gingerbread
...
* commit 'dc43877b3875eb7e39e7508bf4009c8bf711d548':
DO NOT MERGE - Don't sync messages moved from the sent folder
2011-03-30 09:31:13 -07:00
Andy Stadler
8252c30599
am 07a85746
: Merge "DO NOT MERGE - Prevent NPE when account sender name is null" into gingerbread
...
* commit '07a85746afecd4267de1fb17f3670b79e06a15f2':
DO NOT MERGE - Prevent NPE when account sender name is null
2011-03-30 09:31:08 -07:00
Andy Stadler
3f8c081d2b
am aba60dfb
: Merge "DO NOT MERGE - Fix NPE when trying to open attachments" into gingerbread
...
* commit 'aba60dfb73f2e1c8406f64ba04f42d4d9a29dd1f':
DO NOT MERGE - Fix NPE when trying to open attachments
2011-03-30 09:31:02 -07:00
Andy Stadler
4fed865309
am 064c1870
: Merge "DO NOT MERGE - Fix NPE in pop3 checkcapabilities" into gingerbread
...
* commit '064c1870195a5d53346fd591072cc487083be7b6':
DO NOT MERGE - Fix NPE in pop3 checkcapabilities
2011-03-30 09:30:59 -07:00
Andy Stadler
07eb4bdc01
am 8f0a79c2
: DO NOT MERGE - Add 55 roadrunner email setups
...
* commit '8f0a79c2ef29b714110ee00a4fc28f97a729d4ef':
DO NOT MERGE - Add 55 roadrunner email setups
2011-03-30 09:30:50 -07:00
Justin Ho
e5705c53ae
am e55458fa
: Merge "DO NOT MERGE Don\'t duplicate HTML in reply / forward" into honeycomb-mr1
...
* commit 'e55458fa4dcb27e686a9b5d37727c45fb8552875':
DO NOT MERGE Don't duplicate HTML in reply / forward
2011-03-29 15:35:13 -07:00
Justin Ho
e55458fa4d
Merge "DO NOT MERGE Don't duplicate HTML in reply / forward" into honeycomb-mr1
2011-03-29 15:16:00 -07:00
Eric Fischer
fa2047aacf
am 936eb17e
: am caf358ed
: (-s ours) Import revised translations. DO NOT MERGE
...
* commit '936eb17e5ced0edeb89e9b7da75b559a8a4e4fbf':
Import revised translations. DO NOT MERGE
2011-03-29 14:19:57 -07:00
Eric Fischer
936eb17e5c
am caf358ed
: (-s ours) Import revised translations. DO NOT MERGE
...
* commit 'caf358ed753e64ce1bc8aeb65cf728aed19f8662':
Import revised translations. DO NOT MERGE
2011-03-29 14:07:19 -07:00
Eric Fischer
caf358ed75
Import revised translations. DO NOT MERGE
...
Change-Id: I4bb7445a1b1e83b2d34dccaea7cbb98e28461bbc
2011-03-29 13:29:51 -07:00
Eric Fischer
1b63120a3c
am 7568aa93
: Import revised translations. DO NOT MERGE
...
* commit '7568aa936a90e19c5ffb7f7451d6a3804485e52b':
Import revised translations. DO NOT MERGE
2011-03-29 12:25:01 -07:00
Eric Fischer
7568aa936a
Import revised translations. DO NOT MERGE
...
Change-Id: I92eab36c38104024c0e885240f705e57303fb617
2011-03-29 11:59:24 -07:00
Andy Stadler
6c6f149198
Merge "DO NOT MERGE - Update version number for GB-MR2 update." into gingerbread
2011-03-28 09:40:51 -07:00
Andy Stadler
188fb8d6d6
Merge "DO NOT MERGE - Clear cached CalendarObservers after Calendar wipe" into gingerbread
2011-03-28 09:39:03 -07:00
Andy Stadler
dc43877b38
Merge "DO NOT MERGE - Don't sync messages moved from the sent folder" into gingerbread
2011-03-25 17:25:41 -07:00
Andy Stadler
07a85746af
Merge "DO NOT MERGE - Prevent NPE when account sender name is null" into gingerbread
2011-03-25 16:44:05 -07:00
Andy Stadler
aba60dfb73
Merge "DO NOT MERGE - Fix NPE when trying to open attachments" into gingerbread
2011-03-25 16:43:50 -07:00
Andy Stadler
064c187019
Merge "DO NOT MERGE - Fix NPE in pop3 checkcapabilities" into gingerbread
2011-03-25 16:43:42 -07:00
Andy Stadler
2ac4f855ea
DO NOT MERGE - Don't sync messages moved from the sent folder
...
Modified location of the test to processUploadMessage() method. We do this to
prevent creating multiple EmailContent.Message objects.
Bug: 4096266
Backport from: Id83d3703283c0cd89a60c6210976093d39fb6934
Change-Id: Ie0e9c52182df96617cc942235135ef5ccf865d41
2011-03-25 16:36:11 -07:00
Andy Stadler
9258827315
DO NOT MERGE - Prevent NPE when account sender name is null
...
Bug: 3500373
Backport of: Id07270f34d9cc0523c46104b3167711b71798623
Change-Id: I23464e3edd9c8d8ecc54451cf7eabfddb73bd745
2011-03-25 16:29:53 -07:00
Andy Stadler
8faae52c0d
DO NOT MERGE - Clear cached CalendarObservers after Calendar wipe
...
* This fix may resolve the bugs referenced below; the issue fixed
could cause pandemonium after the server commands a wipe of calendar
data and most likely explains these issues (via Occam's Razor)
* Also backport a SQL fix to more reliably delete calendar data
Bug: 4077499
Bug: 4064237
Backport from: I628fb14ea2c04150d4f27341751f0eab61ee33d1
Change-Id: I7667a11663d8720a92b9eba0748f60256a25edba
2011-03-25 16:18:06 -07:00
Andy Stadler
397439881a
DO NOT MERGE - Fix NPE when trying to open attachments
...
The attachment info may be null when we attempt to mark them for
downloading. Add a null-check before we try to dereference the info
structure.
Bug: 4053184
Backport of: I831e3abd100664c92f7af585014a03250e40ff64
Change-Id: Iffdf8cdc3a17c0ab691596eb9e240ef87acb2e37
2011-03-25 16:11:09 -07:00
Todd Kennedy
5c9be9af18
DO NOT MERGE Don't duplicate HTML in reply / forward
...
On exchange servers that support "smart reply", the original message is
actually appended by the server. In this situation, we should not append
the original HTML text on the client.
bug 4177192
Change-Id: I0bdb34cf837e0cc0bfac8917f993ecb764814d97
2011-03-25 15:50:04 -07:00
Andy Stadler
0408ee5b94
DO NOT MERGE - Fix NPE in pop3 checkcapabilities
...
* This happens if an open fails immediately (error message in the
initial banner) followed by a checkSettings.
* The fix is to harden checkSettings to force a clean connection
every time.
Bug: 2170147
Backport of: If7403bf517477d2b03b21d71caab511fe45e234c
Change-Id: Ia6cc0e3ab0c8a8a78b5d8b8fb7b8ba4b4cdd3ef2
2011-03-25 15:08:34 -07:00
Andy Stadler
bd3dd0038d
DO NOT MERGE - Update version number for GB-MR2 update.
...
Change-Id: I4d3242935676d5c5aa2347c66ff795589066a500
2011-03-25 14:45:01 -07:00
Andy Stadler
8f0a79c2ef
DO NOT MERGE - Add 55 roadrunner email setups
...
Bug: 4086524
Backport Of: I8d7758d3720e45515abae1d071a8b149ac63a4ce
Change-Id: If5c20e9f8351864a7878a7eef229ab1e0ec850e1
2011-03-25 14:41:25 -07:00
Todd Kennedy
f52697f42a
am 99930f81
: Don\'t load from the network until specified
...
* commit '99930f81f1b7f1d5b769be958b3d1efe0aeef3fc':
Don't load from the network until specified
2011-03-24 16:18:40 -07:00
Todd Kennedy
99930f81f1
Don't load from the network until specified
...
We were always loading from the network for HTML messages. Now we don't
load from the network until the user clicks the "display images" button.
Change-Id: I4cdfea5e5338f3bba70b3d04df6551516d3e1a85
2011-03-24 16:08:57 -07:00
Eric Fischer
1157196e36
am d6dbe885
: (-s ours) am 73310179
: Import revised translations. DO NOT MERGE
...
* commit 'd6dbe88595ce0e0a44110f1d714f758fe05f5246':
Import revised translations. DO NOT MERGE
2011-03-18 16:54:47 -07:00
Eric Fischer
d6dbe88595
am 73310179
: Import revised translations. DO NOT MERGE
...
* commit '7331017905450502d0e8e0b849c01d136696d9af':
Import revised translations. DO NOT MERGE
2011-03-18 16:10:11 -07:00
Eric Fischer
7331017905
Import revised translations. DO NOT MERGE
...
Change-Id: I708facf4f7eebd708abd2a7b2db405a33afc7d00
2011-03-18 15:14:44 -07:00