Merge remote-tracking branch 'github/cm-11.0' into cm-11.0-mod-inverted

Conflicts:
	res/drawable-hdpi/header_bg_mms_widget_holo.9.png
	res/drawable-mdpi/header_bg_mms_widget_holo.9.png
	res/drawable-xhdpi/header_bg_mms_widget_holo.9.png
	src/com/android/mms/ui/ComposeMessageActivity.java

Change-Id: Ib0c60245cf8ab051e90848d2b99f6a5f6e45ff3c