summaryrefslogtreecommitdiff
path: root/java/com/android/dialer/voicemail/listui/res/values
diff options
context:
space:
mode:
authorcalderwoodra <calderwoodra@google.com>2018-03-15 15:56:30 -0700
committerCopybara-Service <copybara-piper@google.com>2018-03-15 15:59:02 -0700
commite760e4204887acd9fb6e4b8b00059659a1367c3b (patch)
tree24876ae821f27b5238d5c72c17db16b04e7d7871 /java/com/android/dialer/voicemail/listui/res/values
parente1c143a195540baf5ddc2525129ced08cddccbc0 (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/voicemail/listui/res/values')
-rw-r--r--java/com/android/dialer/voicemail/listui/res/values/strings.xml2
1 files changed, 0 insertions, 2 deletions
diff --git a/java/com/android/dialer/voicemail/listui/res/values/strings.xml b/java/com/android/dialer/voicemail/listui/res/values/strings.xml
index 322912eb2..dc54daa19 100644
--- a/java/com/android/dialer/voicemail/listui/res/values/strings.xml
+++ b/java/com/android/dialer/voicemail/listui/res/values/strings.xml
@@ -35,8 +35,6 @@
<!-- Header in voicemail tab to group calls from before yesterday. [CHAR LIMIT=30] -->
<string name="new_voicemail_header_older">Older</string>
- <string name="verizon_terms_and_conditions_title" translatable="false">Turn on visual voicemail</string>
-
<string translatable="false" name="verizon_terms_and_conditions_1.1_english">
Visual Voice Mail (VVM) is a service that provides access to voice mail messages directly on the device, without the need to call *86. This service requires traditional Voice Mail but does not support all traditional Voice Mail features, which you can access by dialing *86 from your handset. Use of this feature will be billed on a per-megabyte basis, or according to any data package you have. Mobile to mobile minutes do not apply. Standard rates apply to any calls, emails or messages initiated from Visual Voice Mail.\n
\n