Merge branch 'jb_3.2.1' of git://codeaurora.org/platform/packages/apps/Email into cm-10.2

Change-Id: I3dd134a293b0fe632ccbf083b7cd2e5f876b7ee8