am 73d2be2a: am 70acadbc: Merge "Prevent an NPE" into jb-ub-mail-ur9

* commit '73d2be2a5a233f45df6a39f7bb7a8f97a791866f':
  Prevent an NPE
am d5645786: Merge "Merge in some upstream changes to HtmlTree" into jb-ub-mail-ur10

* commit 'd564578638fd22c91c95637998c46b45dc511ccd':
  Merge in some upstream changes to HtmlTree
am c56b2330: Don\'t print <style> contents in plaintext

* commit 'c56b233013cf107c702ef9f61305282670ad804a':
  Don't print <style> contents in plaintext
am d5616f81: Remove unused imports and use proper order

* commit 'd5616f81b2fd411b7fac8ed63eaac044c267188a':
  Remove unused imports and use proper order
am c9a4eddb: am f8b613c1: patch up respond() results with cache contents (the easy way)

* commit 'c9a4eddb24f8c26e7e11e5a487bbced29a5d0b35':
  patch up respond() results with cache contents (the easy way)
Import translations. DO NOT MERGE

Change-Id: I19f8c8043882539cd313b3a2b7e19d44ea6624e7
Auto-generated-cl: translation import
am ec81b025: am a313d18e: Don\'t track system folders in recents

* commit 'ec81b02542a262a366a14b2aa7250ff0d37d607e':
  Don't track system folders in recents
am b45680bd: am 4677d5cc: Merge "fix getItemId crash on empty cursors" into jb-ub-mail-ur9

* commit 'b45680bd34f1de4ae75e9be1fd8044a127917b4c':
  fix getItemId crash on empty cursors
am 1b30609b: Merge "Add margins to email messages." into jb-ub-mail-ur10

* commit '1b30609b36dc7388307e3a0b3652153b4ead8499':
  Add margins to email messages.
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