Merge "Fix NPE when parceling SubInfoRecord" into lmp-mr1-dev

automerge: ac61828

* commit 'ac61828bed8219b94afe4fe2f32cae6ef70130c0':
  Fix NPE when parceling SubInfoRecord

src/com/android/settings/sim/SimSettings.java

@@ -485,7 +485,7 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable
                 } else {
                     setTitle(mSubInfoRecord.getDisplayName());
                 }
-                setSummary(mSubInfoRecord.getNumber().toString());
+                setSummary(mSubInfoRecord.getNumber());
                 setEnabled(true);
             } else {
                 setSummary(R.string.sim_slot_empty);