Merge remote-tracking branch 'cm/cm-11.0' into kitkat

Conflicts:
	src/com/android/mms/ui/ComposeMessageActivity.java
msim: Use the SIM operator to label the subscription

network operator is confusing, and downright misleading in roaming
cases

Change-Id: I3f645bbf1191f086ec0b6ca6cc8669915b2902a4
Mms: Scrub debug logging for identifiable information, fix codestyle.

Change-Id: I07e865c9f0b47a9841e7fa2c6a232a1b51d6ad48
Automatic translation import

Change-Id: I93192267787fbe2ac776719c904eb027a2f9c3b9
Merge remote-tracking branch 'cm/cm-11.0' into kitkat