Merge remote-tracking branch 'upstream/cm-11.0' into HEAD
Hide "Insert smiley" if emoticons are disabled

There's no point in having "insert smiley" option when
graphical emoticons are disabled.
I still hate these emoticons.

Change-Id: I2b811015910811e211c9e3e203532f19c29a0638
Mms: disable SplitActionBar

This makes the UI more consistent with newer Email app look.

Screenshots:
  https://dl.dropboxusercontent.com/u/16268774/cm_temp/email.jpg
  https://dl.dropboxusercontent.com/u/16268774/cm_temp/mms.jpg

Change-Id: I71c287f258b9cb8f4b94456ecc9d4034d4680525
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
Automatic translation import

Change-Id: Ic8b437f501e973b47d1d6b123d7a0eefebf6a13d
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
Merge branch 'cm-11.0' of git://github.com/cristianomatos/android_packages_apps_Mms into HEAD