am 624d8c50: (-s ours) am 82eadd60: (-s ours) am d384fcbf: (-s ours) Import translations. DO NOT MERGE

# Via Android Git Automerger (2) and Baligh Uddin (1)
* commit '624d8c5026311ad652874ae434c690977273c699':
  Import translations. DO NOT MERGE
am 4b5c4b96: am 2f9c66d0: Use swipe preference for archive/delete action

# Via Android Git Automerger (1) and Scott Kennedy (1)
* commit '4b5c4b9697192d6b9634e442465877303b1b2a68':
  Use swipe preference for archive/delete action
am 0e0670f7: am 51243313: Merge "Fix how visibleLimit for a Mailbox is set." into jb-ub-mail-ur9

* commit '0e0670f7575baca3346809f2b04b7b625fa4bebe':
  Fix how visibleLimit for a Mailbox is set.
am 7e6a7e06: am 779fe020: First part of switching Email to use ContentResolver#call

* commit '7e6a7e0661080ae4560e6bab7fef52877c55ad23':
  First part of switching Email to use ContentResolver#call
am 6ae44c50: am e04b7368: Remove deprecated fields/members

* commit '6ae44c503f9459eba536936c0981d693a75f0139':
  Remove deprecated fields/members
am 3aab7e0f: am 7401a826: Fix suggestions from last CL

* commit '3aab7e0f6a549afb61fe24722754deb0a0633317':
  Fix suggestions from last CL
am 52fc0ed5: am ffa3370b: am ea2edb63: Set MIME type correctly on drafts when content provider does not provide it.

* commit '52fc0ed569273edc332ce859cdd742ea206e0894':
  Set MIME type correctly on drafts when content provider does not provide it.
am fcbb206a: am 82fef2b3: Remove usage of deprecated field

* commit 'fcbb206a742bb035a844416be15ddd103126b2b4':
  Remove usage of deprecated field
am 5088cfcd: am 4b6d17eb: Remove versionName

* commit '5088cfcd7bb1fa96ea11f61cfc19f15360663885':
  Remove versionName
am 94c898e9: am 3e2fdd33: Fix account creation

* commit '94c898e925e6aac6361a01519fa03296e377c27b':
  Fix account creation
am 1a0d1342: am 9a952538: Cache attachments on send

* commit '1a0d1342bebdb04b3faa41daa5cd3fb45575344a':
  Cache attachments on send
am 4c63a6fe: am 4da36412: Clean up ServiceProxy.

* commit '4c63a6fe292b37238ff80e1a0ead83684ce66843':
  Clean up ServiceProxy.
am 737592f5: am 3bf72818: Temporary Work around bug 8170660

* commit '737592f5fbf079487a0f21b04d302c8cd39dbee0':
  Temporary Work around bug 8170660
am d8cf863d: am 3f0f64f7: Enable the MailLogService for Email

* commit 'd8cf863d3527b950eeca806cf8b4e9a71c0cb82d':
  Enable the MailLogService for Email
am 075177c1: am 1bc34c43: Set local sdk version

* commit '075177c1b8e5bdb84c380d19298b9c12ec8940ec':
  Set local sdk version
am 5ddf2e7e: am 32881e8d: Fix NPE after migrating older account

* commit '5ddf2e7ee7277b54042be818feac5bd97f8fb6bb':
  Fix NPE after migrating older account
am 60012cbe: am 6967b6b6: Merge "When folder is changed, also update conversation list." into jb-ub-mail-ur9

* commit '60012cbe843a154c31a9ee4c4cfd0c0378453b42':
  When folder is changed, also update conversation list.
am 001317c8: am c813ab6c: Increment email2 version code.

* commit '001317c879fc273e4f0067155a09c52358d71ebb':
  Increment email2 version code.
am d906713f: am 1cea05ac: Merge "Make widgets work again" into jb-ub-mail-ur9

* commit 'd906713f3707e763f8bca8e2f5bbe619e2361087':
  Make widgets work again
am b1b69755: am 1eebd2f6: Increment version for email.

* commit 'b1b697554968a4af051bc33712acdbae940d3a6c':
  Increment version for email.