merge in klp-release (no-op)
Import translations. DO NOT MERGE

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

Change-Id: I64210142f2e12de173da36465272e4297995565c
Auto-generated-cl: translation import
Merge "Import translations. DO NOT MERGE" into klp-dev
am 23b67fb6: (-s ours) Import translations. DO NOT MERGE

* commit '23b67fb671ca5773e54adbd8fc38f4a8b2effed4':
  Import translations. DO NOT MERGE
Add stat_notify_email to drawable-mdpi

Also, remove exec perm from a resource

Bug: 11228037
Change-Id: I47eb500606c529183e458be8bec1c1f3a8a47b04
Remove unread email sender info from NestedFolderTeaserView.

Bug: 11241850
Change-Id: I334cd41b4f28bc2261344286c5fc79c9246bfd63
am d85b9657: Remove unread email sender info from NestedFolderTeaserView.

* commit 'd85b965762c268418d1ef306e783c2f7bb0b3ddb':
  Remove unread email sender info from NestedFolderTeaserView.
Merge "Add stat_notify_email to drawable-mdpi" into jb-ub-mail-ur10
am bfba6ef8: Merge "Add stat_notify_email to drawable-mdpi" into jb-ub-mail-ur10

* commit 'bfba6ef8fc528f26a938ed52ff3ac941a8e84fcf':
  Add stat_notify_email to drawable-mdpi
Populate real name in From: field

b/11246653

Change-Id: I4c9ee826e0628bf04bffb98209c67318491b517e
Merge "Populate real name in From: field" into jb-ub-mail-ur10
am a2210d03: Merge "Populate real name in From: field" into jb-ub-mail-ur10

* commit 'a2210d035e51d0656f7e58c8c4c0a3b126de7d64':
  Populate real name in From: field
Restore sender snippet for nested folder teaser.

It's a bit ugly, but it's much better than firing up a new loader for each subfolder.

b/11288044

Change-Id: I509503e95ccbcfafbd89b755f2197d8a5f1ed1b8
am 42fe486e: Restore sender snippet for nested folder teaser.

* commit '42fe486e9e80a13d7f94573af1000f883a5d9dab':
  Restore sender snippet for nested folder teaser.
Import translations. DO NOT MERGE

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

Change-Id: If217e077ef0b9713f01cd1f6602a3576b3a18be9
Auto-generated-cl: translation import
Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10
Merge "Import translations. DO NOT MERGE" into klp-dev
am fa7920dd: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10

* commit 'fa7920ddf018ed9185d6ea07111f93b1bda203c8':
  Import translations. DO NOT MERGE