am b6073c48: am 93ecb1f0: Merge "Settings: Fix wifi developer options summaries"

* commit 'b6073c486cb2eb537fd6e53000dce55afe762fc1':
  Settings: Fix wifi developer options summaries
This commit is contained in:
Alan Viverette
2015-04-24 18:41:05 +00:00
committed by Android Git Automerger

View File

@@ -110,17 +110,17 @@
<SwitchPreference <SwitchPreference
android:key="wifi_verbose_logging" android:key="wifi_verbose_logging"
android:title="@string/wifi_verbose_logging" /> android:title="@string/wifi_verbose_logging"
android:summary="@string/wifi_verbose_logging_summary"/> android:summary="@string/wifi_verbose_logging_summary"/>
<SwitchPreference <SwitchPreference
android:key="wifi_aggressive_handover" android:key="wifi_aggressive_handover"
android:title="@string/wifi_aggressive_handover" /> android:title="@string/wifi_aggressive_handover"
android:summary="@string/wifi_aggressive_handover_summary"/> android:summary="@string/wifi_aggressive_handover_summary"/>
<SwitchPreference <SwitchPreference
android:key="wifi_allow_scan_with_traffic" android:key="wifi_allow_scan_with_traffic"
android:title="@string/wifi_allow_scan_with_traffic" /> android:title="@string/wifi_allow_scan_with_traffic"
android:summary="@string/wifi_allow_scan_with_traffic_summary"/> android:summary="@string/wifi_allow_scan_with_traffic_summary"/>
<ListPreference <ListPreference