Merge "Remove emergency info subtitle" into nyc-dev

This commit is contained in:
Maria Garcia Puyol
2016-03-18 15:37:58 +00:00
committed by Android (Google) Code Review
2 changed files with 1 additions and 4 deletions

View File

@@ -5409,8 +5409,6 @@
<string name="user_enable_calling_and_sms_confirm_message">Call and SMS history will be shared with this user.</string>
<!-- Title for the emergency info preference [CHAR LIMIT=40] -->
<string name="emergency_info_title">Emergency information</string>
<!-- Description of the emergency info preference [CHAR LIMIT=none] -->
<string name="emergency_info_subtitle">Accessible by anyone from the emergency dialer without unlocking your phone</string>
<!-- Application Restrictions screen title [CHAR LIMIT=45] -->
<string name="application_restrictions">Allow apps and content</string>

View File

@@ -38,6 +38,5 @@
</PreferenceCategory>
<Preference
android:key="emergency_info"
android:title="@string/emergency_info_title"
android:summary="@string/emergency_info_subtitle"/>
android:title="@string/emergency_info_title" />
</PreferenceScreen>