Merge "Remove Backup and Reset duplicates from Settings search" into oc-dev am: 4bd0f411ce

am: af054e63e0

Change-Id: I35667061a61fd66e8ab8acafccffb53f00f15149
This commit is contained in:
Matthew Fritze
2017-05-17 19:06:59 +00:00
committed by android-build-merger
3 changed files with 69 additions and 1 deletions

View File

@@ -18,7 +18,8 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
android:title="@string/reset_dashboard_title">
android:title="@string/reset_dashboard_title"
android:key="reset_dashboard_fragment_screen">
<!-- Network reset -->
<com.android.settingslib.RestrictedPreference