resolve merge conflicts of 259b6a80 to master.

    <string name="suggestion_remove">Remove</string>

    <!-- Name of the setting to change the display's color temperature -->

    <string name="color_temperature">Display color temperature</string>

    <string name="color_temperature">Cool color temperature</string>

    <!-- Description of the setting to change the display's color temperature -->

    <string name="color_temperature_desc">Enable cool temperature</string>

    <string name="color_temperature_desc">Use cooler display colors</string>

    <!-- Toast message letting the user know the color temperature setting is not immediate -->

    <string name="color_temperature_toast">To apply color change, turn off screen</string>

    <!-- Label for category for data usage [CHAR LIMIT=30] -->

    <string name="usage">Usage</string>

import android.webkit.WebViewProviderInfo;

import android.widget.Switch;

import android.widget.TextView;

import android.widget.Toast;

import com.android.internal.app.LocalePicker;

import com.android.internal.logging.MetricsLogger;

        SystemProperties.set(COLOR_TEMPERATURE_PROPERTY,

                mColorTemperaturePreference.isChecked() ? "1" : "0");

        pokeSystemProperties();

        Toast.makeText(getActivity(), R.string.color_temperature_toast, Toast.LENGTH_LONG).show();

    }

    private void updateUSBAudioOptions() {