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

                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"