resolved conflicts for merge of 2cc7c87b to master
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ce007b2..83d839e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -732,5 +732,5 @@
<string name="exporting_contact_list_progress"><xliff:g id="current_number">%s</xliff:g> of <xliff:g id="total_number">%s</xliff:g> contacts</string>
<!-- The string used to describe Contacts as a searchable item within system search settings. -->
- <string name="search_settings_description">Names in your contact list</string>
+ <string name="search_settings_description">Names of your contacts</string>
</resources>