resolve merge conflicts of f2801e46 to nyc-mr1-dev

    <!-- Preference title for option to automatically switch away from bad wifi networks [CHAR LIMIT=60]-->

    <string name="wifi_cellular_data_fallback_title">Switch to cellular data automatically</string>

    <!-- Preference summary for option to automatically switch away from bad wifi networks [CHAR LIMIT=None]-->

    <string name="wifi_cellular_data_fallback_summary">Use cellular data when Wi\u2011Fi loses Internet access. Data usage may apply.</string>

    <string name="wifi_cellular_data_fallback_summary">Use cellular data when Wi\u2011Fi has no Internet access. Data usage may apply.</string>

    <!-- Action bar text message to manually add a wifi network [CHAR LIMIT=20]-->

    <string name="wifi_add_network">Add network</string>

    <!-- Header for the list of wifi networks-->