CarbonDevXperia/android_packages_apps_Settings — pull request #31 by alwaysadeel (2014-11-17 05:10:46+00:00)
Title: Settings: move getFormattedSimName() to frameworks (1/2)

Conflicts:
res/values/cm_strings.xml
src/com/android/settings/DataUsageSummary.java
src/com/android/settings/MultiSimSettings.java
src/com/android/settings/SelectSubscription.java

Signed-off-by: Roman Birg

Change-Id: I6925ac82a777c15fcb6b8ada37ef79dd31ce77dd