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/dialer/app/res/values/strings.xml | |
parent | ecb63000f5d94a5b7ebdf4f6ff08fcc942fce952 (diff) | |
parent | e760e4204887acd9fb6e4b8b00059659a1367c3b (diff) |
Merge "Resolve all build resource conflicts."
Diffstat (limited to 'java/com/android/dialer/app/res/values/strings.xml')
-rw-r--r-- | java/com/android/dialer/app/res/values/strings.xml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/java/com/android/dialer/app/res/values/strings.xml b/java/com/android/dialer/app/res/values/strings.xml index 7c883299c..e5092f001 100644 --- a/java/com/android/dialer/app/res/values/strings.xml +++ b/java/com/android/dialer/app/res/values/strings.xml @@ -718,8 +718,4 @@ <!-- If a user deletes a call that has attachments (photo, message, ect) bundled with it, they need to be told that they need to go to the SMS app to delete the attachments. [CHAR LIMIT=NONE] --> <string name="multiple_ec_data_deleted">Calls deleted. View and delete attachments shared during calls in Messages.</string> - - <!-- Name of launcher shortcut for the new UI main activity. - TODO(38502365): Remove this once we're ready to launch the new UI. --> - <string translatable="false" name="nui_shortcut_name">Phone NUI</string> </resources> |