diff options
author | calderwoodra <calderwoodra@google.com> | 2018-03-15 15:56:30 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-03-15 15:59:02 -0700 |
commit | e760e4204887acd9fb6e4b8b00059659a1367c3b (patch) | |
tree | 24876ae821f27b5238d5c72c17db16b04e7d7871 /java/com/android/dialer/speeddial | |
parent | e1c143a195540baf5ddc2525129ced08cddccbc0 (diff) |
Resolve all build resource conflicts.
For simplicity, instead of resolve the nui shortcut string, I
deleted it since it isn't used anymore.
Test: build log
PiperOrigin-RevId: 189260472
Change-Id: I67d5a49d78916a8960e41ad1c7b7f59efad6d718
Diffstat (limited to 'java/com/android/dialer/speeddial')
-rw-r--r-- | java/com/android/dialer/speeddial/SuggestionViewHolder.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/java/com/android/dialer/speeddial/SuggestionViewHolder.java b/java/com/android/dialer/speeddial/SuggestionViewHolder.java index 68c0ce4c3..213a54f55 100644 --- a/java/com/android/dialer/speeddial/SuggestionViewHolder.java +++ b/java/com/android/dialer/speeddial/SuggestionViewHolder.java @@ -63,8 +63,7 @@ public class SuggestionViewHolder extends RecyclerView.ViewHolder implements OnC String secondaryInfo = TextUtils.isEmpty(label) ? number - : context.getString( - com.android.contacts.common.R.string.call_subject_type_and_number, label, number); + : context.getString(R.string.call_subject_type_and_number, label, number); nameOrNumberView.setText(name); numberView.setText(secondaryInfo); |