Import translations. DO NOT MERGE

Change-Id: I8030d9c9e210866bbdc882075686483c42e1d250
Auto-generated-cl: translation import
CL to support method signature change.

Helps fix b/7923968. This is just a one-line
change. The real change is in the UnifiedEmail code.

Change-Id: I60808c0265e911394cbffa92214d10626769ca9a
am c2dfee3c: (-s ours) Import translations. DO NOT MERGE

* commit 'c2dfee3ca81ddd1fce5194dcc2ecc90abfa60dd3':
  Import translations. DO NOT MERGE
Merge "CL to support method signature change." into jb-ub-mail-ur9
am 7ed75feb: Merge "CL to support method signature change." into jb-ub-mail-ur9

* commit '7ed75feb1492ac3350ba00527a11d26a239e4511':
  CL to support method signature change.
Settings changes

Bug: 8685202
Change-Id: Ica781557b91e5ed43221f6e28b9d65cbb044ea55
Show an error on security exception for attachments.

This uses an existing notification for bad forwarding. The
text is a bit odd ("Attachment not forwarded") but avoids
adding new text right now, and at least conveys the error.

Bug: 8417004
Change-Id: Id3629a39b2afb583bac2ea6a3ef1303694f1100c
am 643846ab: Settings changes

* commit '643846abbd1ae60454fc8191992afffd08114e98':
  Settings changes
am 54c88ffa: Show an error on security exception for attachments.

* commit '54c88ffa4c4877057d06c4534f94b9546e29fa72':
  Show an error on security exception for attachments.
am ddbdf5da: am 54c88ffa: Show an error on security exception for attachments.

* commit 'ddbdf5daaf41547f955bb2724b801c7cbe04ace5':
  Show an error on security exception for attachments.
Import translations. DO NOT MERGE

Change-Id: I73d879a369f4f0349ce9c590882eb485eaab64bd
Auto-generated-cl: translation import
Import translations. DO NOT MERGE

Change-Id: I06bc1d390dba17ab69bcf287dce947277ad28542
Auto-generated-cl: translation import
Import translations. DO NOT MERGE

Change-Id: I2cf4378068aa1df3e6dd5ba613c857679f81e4f3
Auto-generated-cl: translation import
am 33558fc1: (-s ours) Import translations. DO NOT MERGE

* commit '33558fc1335417c504337c64ef3119c119e8f5c6':
  Import translations. DO NOT MERGE
PreferenceMigrator force commits pref upgrades.

Now, when PreferenceMigrator.migrate is run,
we forcibly call commit after the VersionedPrefs
object is updated (whether MailPrefs, AccountPreferences
or FolderPreferences). This commit applies the change to
Email2. Should fix b/8640441 and b/8520847.

Change-Id: I9a014c1c4bd35aa2ea8e268fec9a050d47e4d732
am 156a9bde: PreferenceMigrator force commits pref upgrades.

* commit '156a9bde06ec72f497f50ad1c7258636067512a6':
  PreferenceMigrator force commits pref upgrades.
Add "Reply all" setting to tablets

This controls the notification action on tablets.

Change-Id: I0b8df2ded371820f0dada3f1b11cebad462962ed
am c726d4fa: Add "Reply all" setting to tablets

* commit 'c726d4fa6cd5239f9b902e954efaab7752d26471':
  Add "Reply all" setting to tablets
Use system SyncManager for Exchange.

Change-Id: I77e4e75c94c532d22a28cf97e6f55f1259b8bdde
Sender images in email

This is the minimum change to not break the build in Email when CL
for removing checkboxes is submitted in MR2.
I'm still investigating why contact images aren't showing up in Email and
will follow up with a fix.

Change-Id: I814ed2b0b0a468ee465e57c47c6c7248f4afdbbc