resolved conflicts for merge of a7955aee to master
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b7fd223..cbc98a0 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -729,5 +729,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">Address book</string>
+ <string name="search_settings_description">People and phone numbers</string>
</resources>