commit 26bd4d1807d71eb749ddbec32227cb08d55173f5
author Matthew Fritze <mfritze@google.com> Tue May 30 20:51:00 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 30 20:51:00 2017 +0000
tree 5a884432b6d3f8209d835e6e110c7e39cdb2a55e
parent cf162d12913f5cceca9b4e5a3bf5858985e547b2
parent 53c8d6c2b2055482e037a8ef3766c3e6f77e64a7

Merge "Location summary is no longer indexed" into oc-dev am: fed6e817a5
am: 53c8d6c2b2

Change-Id: I81c15d76c260969bb53a0c9462db3fabbb31f6cb

res/xml/location_settings.xml

diff --git a/res/xml/location_settings.xml b/res/xml/location_settings.xml
index e063d13..77063bd 100644
--- a/res/xml/location_settings.xml
+++ b/res/xml/location_settings.xml
@@ -24,7 +24,7 @@
             android:key="location_mode"
             android:title="@string/location_mode_title"
             settings:keywords="@string/keywords_location_mode"
-            android:summary="@string/location_mode_location_off_title" />
+            android:summary="@string/summary_placeholder" />
 
         <!-- This preference category gets removed if there is no managed profile -->
         <com.android.settingslib.RestrictedSwitchPreference