Merge "Bug 5003361: No Android Dreams in Settings / Display"

This commit is contained in:
Gilles Debunne
2011-07-29 15:47:15 -07:00
committed by Android (Google) Code Review

View File

@@ -40,10 +40,12 @@
android:entries="@array/screen_timeout_entries"
android:entryValues="@array/screen_timeout_values" />
<!--
<PreferenceScreen
android:title="@string/dream_settings_title"
android:summary="@string/dream_settings_summary"
android:fragment="com.android.settings.DreamSettings" />
-->
<ListPreference
android:key="font_size"