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/blocking/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'java/com/android/dialer/blocking/res/values/strings.xml')

diff --git a/java/com/android/dialer/blocking/res/values/strings.xml b/java/com/android/dialer/blocking/res/values/strings.xml
index 7b344da4a..e5f6c8000 100644
--- a/java/com/android/dialer/blocking/res/values/strings.xml
+++ b/java/com/android/dialer/blocking/res/values/strings.xml
@@ -29,7 +29,7 @@
   </string>
 
   <!-- Confirmation dialog title for blocking a number. [CHAR LIMIT=NONE] -->
-  <string name="block_number_confirmation_title">
+  <string name="old_block_number_confirmation_title">
     Block<xliff:g example="(555) 555-5555" id="number">%1$s</xliff:g>?
   </string>
 
-- 
cgit v1.2.3