Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
am 99502781: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '99502781cb8af95f32d9c351998148d8a1679c96':
  Import translations. DO NOT MERGE
am 99502781: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '99502781cb8af95f32d9c351998148d8a1679c96':
  Import translations. DO NOT MERGE
Merge "Import translations. DO NOT MERGE" into jb-ub-mail
am f4fd55cf: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail

* commit 'f4fd55cf72a9ff60836a5484fc0e91b82edff8d8':
  Import translations. DO NOT MERGE
am 285163e0: (-s ours) am f4fd55cf: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail

* commit '285163e0258d41cce1ad2a3479058b21c880e0bf':
  Import translations. DO NOT MERGE
am 285163e0: am f4fd55cf: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail

* commit '285163e0258d41cce1ad2a3479058b21c880e0bf':
  Import translations. DO NOT MERGE
merge in jb-mr1-release history after reset to jb-mr1-dev
am 8e1ddb44: am 798807ec: am 7a4181e7: Bump version code

* commit '8e1ddb44d47e784dcb11e34547b4d61d99802647':
  Bump version code
am f2e07eac: (-s ours) am 99502781: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit 'f2e07eac909e0abf611794aea56cd51e7ca3845c':
  Import translations. DO NOT MERGE
am 89f0b6e2: (-s ours) am 285163e0: am f4fd55cf: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail

* commit '89f0b6e2bd2e74638d8f569707ccdf61fcf0025e':
  Import translations. DO NOT MERGE
Lib has been renamed to calendar2; fix build

Change-Id: I2110489c6316b3cc639e5bf9aa6cc991aa2e298b
am 976e98bf: Lib has been renamed to calendar2; fix build

* commit '976e98bfc2dd7f782fc92cc4242f9dcebc2b6858':
  Lib has been renamed to calendar2; fix build
am 73e9ec5b: am 976e98bf: Lib has been renamed to calendar2; fix build

* commit '73e9ec5b65d020c4e5388799e3281878465bcf5a':
  Lib has been renamed to calendar2; fix build
am 73e9ec5b: am 976e98bf: Lib has been renamed to calendar2; fix build

* commit '73e9ec5b65d020c4e5388799e3281878465bcf5a':
  Lib has been renamed to calendar2; fix build
Properly handle smart-forwarded attachments

Bug: 7115207
Change-Id: I2cd4fcb39e7711bb1a19032df1bce73e94395486
Merge "Properly handle smart-forwarded attachments" into jb-ub-mail
am d5ce27c8: Merge "Properly handle smart-forwarded attachments" into jb-ub-mail

* commit 'd5ce27c8aa3bb83fe4ffc1d2df04f74f8ae4dfae':
  Properly handle smart-forwarded attachments
am e1d42a68: am d5ce27c8: Merge "Properly handle smart-forwarded attachments" into jb-ub-mail

* commit 'e1d42a6821d65b4cbf3969aa5a95036d0b0b0dc2':
  Properly handle smart-forwarded attachments
am e1d42a68: am d5ce27c8: Merge "Properly handle smart-forwarded attachments" into jb-ub-mail

* commit 'e1d42a6821d65b4cbf3969aa5a95036d0b0b0dc2':
  Properly handle smart-forwarded attachments