From e760e4204887acd9fb6e4b8b00059659a1367c3b Mon Sep 17 00:00:00 2001
From: calderwoodra <calderwoodra@google.com>
Date: Thu, 15 Mar 2018 15:56:30 -0700
Subject: 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
---
 java/com/android/dialer/speeddial/SuggestionViewHolder.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'java/com/android/dialer/speeddial')

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);
-- 
cgit v1.2.3