resolve merge conflicts of d5b3a5d to nyc-mr1-dev

Change-Id: I1eb01bfdad24935efbbdbeaee0dcf1c374a2cadb

diff --cc res/values/strings.xml
index 54e3eb2,64d4834..4a3145a
--- 1/res/values/strings.xml
--- 2/res/values/strings.xml
+++ b/res/values/strings.xml
@@@ -7472,65 -7466,11 +7472,71 @@@
      <!-- [CHAR LIMIT=60] Name of dev option called demo mode -->
      <string name="demo_mode">Demo mode</string>
  
 +    <!-- Activity title for deletion helper. [CHAR LIMIT=25] -->
 +    <string name="deletion_helper_title">Remove from Device</string>
 +    <!-- Preference group title for the list of apps to uninstall. [CHAR LIMIT=40]-->
 +    <string name="deletion_helper_apps_title">Apps</string>
 +    <!-- Summary of how much storage an app is using and the number of days since last use. [CHAR LIMIT=NONE]-->
 +    <string name="deletion_helper_app_summary"><xliff:g id="used" example="1.2GB">%1$s</xliff:g>, last used <xliff:g id="days" example="67">%2$d</xliff:g> days ago</string>
 +    <!-- Summary of how much storage an app is using when it has never been used before. [CHAR LIMIT=NONE]-->
 +    <string name="deletion_helper_app_summary_never_used"><xliff:g id="used" example="1.2GB">%1$s</xliff:g>, never used before</string>
 +    <!-- Summary of how much storage an app is using when its last use is unknown. [CHAR LIMIT=NONE]-->
 +    <string name="deletion_helper_app_summary_unknown_used"><xliff:g id="used" example="1.2GB">%1$s</xliff:g>, not sure when last used</string>
 +    <!-- Button which clears out storage in the deletion helper. [CHAR LIMIT=60]-->
 +    <string name="deletion_helper_free_button">Free up <xliff:g id="freeable" example="1.2GB">%1$s</xliff:g></string>
 +
 +    <!-- Title text for connecting to customer support [CHAR LIMIT=80]-->
 +    <string name="support_escalation_title">Around the clock help</string>
 +
 +    <!-- Summary text for connecting to customer support [CHAR LIMIT=NONE]-->
 +    <string name="support_escalation_summary">Call or email us and we\'ll get your issue solved right away. No muss, no fuss.</string>
 +
 +    <!-- Title text that indicates there is not internet connection. [CHAR LIMIT=80]-->
 +    <string name="support_offline_title">You\'re offline</string>
 +
 +    <!-- Summary text telling user to connect to Internet in order to request customer support. [CHAR LIMIT=NONE]-->
 +    <string name="support_offline_summary">To reach support, first connect to Wi-Fi or data.</string>
 +
 +    <!-- Title text for showing a list of help options [CHAR LIMIT=80]-->
 +    <string name="support_more_help_title">More help</string>
 +
 +    <!-- Button label for contacting customer support by phone [CHAR LIMIT=20]-->
 +    <string name="support_escalation_by_phone">Phone</string>
 +
 +    <!-- Button label for contacting customer support by phone [CHAR LIMIT=20]-->
 +    <string name="support_escalation_by_phone_offline">Phone</string>
 +
 +    <!-- Button label for contacting customer support by email [CHAR LIMIT=20]-->
 +    <string name="support_escalation_by_email">Email</string>
 +
 +    <!-- Button label for contacting customer support by chat [CHAR LIMIT=20]-->
 +    <string name="support_escalation_by_chat">Chat</string>
 +
 +    <!-- Button label for visiting help forum [CHAR LIMIT=60]-->
 +    <string name="support_forum_title">Help forum</string>
 +
 +    <!-- Button label for visiting help articles [CHAR LIMIT=60]-->
 +    <string name="support_articles_title">Help articles</string>
 +
 +    <!-- Button label for sending user feedback [CHAR LIMIT=60]-->
 +    <string name="support_feedback_title">Send feedback</string>
 +
 +    <!-- Title text that indicates user needs to sign in to get customer support. [CHAR LIMIT=80]-->
 +    <string name="support_sign_in_required_title">Need assistance now?</string>
 +
 +    <!-- Summary text that indicates user needs to sign-in to get real time customer support. [CHAR LIMIT=NONE]-->
 +    <string name="support_sign_in_required_summary" translatable="false"></string>
 +
 +    <!-- Button label for signing in an account [CHAR LIMIT=40]-->
 +    <string name="support_sign_in_button_text">Sign in</string>
 +
 +    <!-- Button label that redirects user who needs help for signin to help screen [CHAR LIMIT=NONE]-->
 +    <string name="support_sign_in_required_help">Can\'t access your account?</string>
+     <!-- [CHAR LIMIT=60] Title of work profile setting page -->
+     <string name="managed_profile_settings_title">Work profile settings</string>
+     <!-- [CHAR LIMIT=60] The preference title for enabling cross-profile remote contact search -->
+     <string name="managed_profile_contact_search_title">Contact search</string>
+     <!-- [CHAR LIMIT=NONE] The preference summary for enabling cross-profile remote contact search -->
+     <string name="managed_profile_contact_search_summary">Allow contact searches by your organization to identify callers and contacts</string>
  
  </resources>

diff --cc src/com/android/settings/SettingsActivity.java
Simple merge