am bd8acad0: Only create one intent per notification

* commit 'bd8acad098abbf074184aa1273d269f7f7a54b37':
  Only create one intent per notification
Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur11
am a8d623a3: Properly size text in Email.

* commit 'a8d623a3676f8abdda52b9516556e52e8490dbf7':
  Properly size text in Email.
am c48313bd: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10

* commit 'c48313bde93e84070d6c75d77dc714529cc08e12':
  Import translations. DO NOT MERGE
am 54a31cce: (-s ours) am 29c549af: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur9

* commit '54a31cce9dc32c64fcb6f6eca3f39500bb0e6cd3':
  Import translations. DO NOT MERGE
Import translations. DO NOT MERGE

Change-Id: Ie8217ec5ea92d48ef3355c9f45111c7f20214273
Auto-generated-cl: translation import
am 64371429: am 07fe8df8: try not to grab the conversation cursor mutex on the main thread

* commit '64371429ac6008df0b4ecd90c9619332359afb8a':
  try not to grab the conversation cursor mutex on the main thread
am 0a97342a: am 0742ee16: fix chained activity leak on compose rotation

* commit '0a97342a4235d574a9c796c11b003dedd2ae1cb8':
  fix chained activity leak on compose rotation
am 9f855d66: don\'t keep a reference to view hierarchy saved state

* commit '9f855d667e34fbf0d330845225c26956e540b819':
  don't keep a reference to view hierarchy saved state
am 1f06ddb8: am 3a6db651: Return to inbox when hitting back from label.

* commit '1f06ddb850f2af07bc23c9065cb8008196092d40':
  Return to inbox when hitting back from label.
am 24633ce8: Merge "Fix hierarchical FolderListFragments" into jb-ub-mail-ur10

* commit '24633ce8bb737f990459210eeffa38f0ca1894c3':
  Fix hierarchical FolderListFragments
am 290cae38: Merge "Basic EML viewing support." into jb-ub-mail-ur10

* commit '290cae38e1911bbbc93e9cb057009ee424f8565c':
  Basic EML viewing support.
Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur11
am ed827da9: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10

* commit 'ed827da90cc859aa20d2500d37a00eeab53e56d5':
  Import translations. DO NOT MERGE
am 991218db: Merge "Mild code cleanup." into jb-ub-mail-ur10

* commit '991218dbc71a75dd35877b5b06049f6bc20e6a1b':
  Mild code cleanup.
am 1505d745: Merge "Move some of emailcommon to UnifiedEmail." into jb-ub-mail-ur10

* commit '1505d745fde6ecd04776c4e8f23417d96a141279':
  Move some of emailcommon to UnifiedEmail.
am 0da15aed: am 0848874d: Fix an ANR

* commit '0da15aedcbfd95784c6f6205fa854bf9329c3b45':
  Fix an ANR
am 6977c68f: (-s ours) am 8929d74f: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur9

* commit '6977c68fe2fb33f1cc57838793aaa45bce4ff8d3':
  Import translations. DO NOT MERGE
am 3ee0c860: am c94d07f4: fix jank during auto-advance animation

* commit '3ee0c860260feba2a9ebbfe84777ea2130a3ed0f':
  fix jank during auto-advance animation
am d70fe49c: Better comments

* commit 'd70fe49cabf896e87574bcb2e57e8a32608537be':
  Better comments