[automerger skipped] [automerger] AOSP/UnifiedEmail - bug fix to composing messages. am: 8c19e4f8fa am: 09976e5356 am: fabc43ef7e am: 93fc485022 am: 62c0cea734 am: 16addb8f66 am: 3aef2f2371 am: bf3bb73e90 am: a48cf7cf64
am: 6bc8d9a464 -s ours
am skip reason: change_id I2a0e1048bac20c4346ec16d4bc8151297971fe0d with SHA1 e292d21d32 is in history

Change-Id: Id760ad142b895f4daa6d9819512ac615f7f6b081