diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-03-16 00:16:50 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-03-16 00:16:50 +0000 |
commit | 80f7f77106755946947c5f99e39b040d7c1c4f08 (patch) | |
tree | 24876ae821f27b5238d5c72c17db16b04e7d7871 /java/com/android/contacts/common/dialog/CallSubjectDialog.java | |
parent | ecb63000f5d94a5b7ebdf4f6ff08fcc942fce952 (diff) | |
parent | e760e4204887acd9fb6e4b8b00059659a1367c3b (diff) |
Merge "Resolve all build resource conflicts."
Diffstat (limited to 'java/com/android/contacts/common/dialog/CallSubjectDialog.java')
-rw-r--r-- | java/com/android/contacts/common/dialog/CallSubjectDialog.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/com/android/contacts/common/dialog/CallSubjectDialog.java b/java/com/android/contacts/common/dialog/CallSubjectDialog.java index 2ba2476a6..7bc13fe72 100644 --- a/java/com/android/contacts/common/dialog/CallSubjectDialog.java +++ b/java/com/android/contacts/common/dialog/CallSubjectDialog.java @@ -331,7 +331,7 @@ public class CallSubjectDialog extends Activity { mNumberView.setText( TextUtils.isEmpty(mNumberLabel) ? mDisplayNumber - : getString(R.string.call_subject_type_and_number, mNumberLabel, mDisplayNumber)); + : getString(R.string.old_call_subject_type_and_number, mNumberLabel, mDisplayNumber)); } else { mNumberView.setVisibility(View.GONE); mNumberView.setText(null); |