Merge "Show emergency info preference for all users" into nyc-dev

am: adcec744b2

* commit 'adcec744b2699a54db5606e9a50a08c6fb243a0e':
  Show emergency info preference for all users
This commit is contained in:
Maria Garcia Puyol
2016-02-18 21:04:38 +00:00
committed by android-build-merger
2 changed files with 10 additions and 13 deletions

View File

@@ -35,9 +35,9 @@
android:key="add_users_when_locked"
android:title="@string/user_add_on_lockscreen_menu"
android:summary="@string/user_add_on_lockscreen_menu_summary" />
<Preference
android:key="emergency_info"
android:title="@string/emergency_info_title"
android:summary="@string/emergency_info_subtitle"/>
</PreferenceCategory>
<Preference
android:key="emergency_info"
android:title="@string/emergency_info_title"
android:summary="@string/emergency_info_subtitle"/>
</PreferenceScreen>