am dc54491b: Merge "Fix overlap when attachment name is long" into ics-mr1

* commit 'dc54491b60fef31309cbaa51a4e0e6056d1a3f4d':
  Fix overlap when attachment name is long
tree: afb7e8fb6409cb89b1bf994a28ce2f5ca2262577
  1. java/
  2. res/
  3. tests/
  4. Android.mk