resolved conflicts for merge of 04c987a8 to master

import android.os.Parcelable;

import android.text.TextUtils;

import android.text.InputType;

import android.text.format.DateFormat;

import android.text.format.DateUtils;

import android.util.AttributeSet;

import android.util.Log;

            mSpinners.removeAllViews();

            // We use numeric spinners for year and day, but textual months. Ask icu4c what

            // order the user's locale uses for that combination. http://b/7207103.

            String pattern = ICU.getBestDateTimePattern("yyyyMMMdd",

                    Locale.getDefault().toString());

            String pattern = DateFormat.getBestDateTimePattern(Locale.getDefault(), "yyyyMMMdd");

            char[] order = ICU.getDateFormatOrder(pattern);

            final int spinnerCount = order.length;

            for (int i = 0; i < spinnerCount; i++) {

import android.content.Context;

import android.content.Intent;

import android.content.IntentFilter;

import android.text.format.DateFormat;

import android.util.AttributeSet;

import android.widget.TextView;

import java.util.Date;

import java.util.Locale;

import libcore.icu.ICU;

public class DateView extends TextView {

    private static final String TAG = "DateView";

        if (mDateFormat == null) {

            final String dateFormat = getContext().getString(R.string.system_ui_date_pattern);

            final Locale l = Locale.getDefault();

            final String fmt = ICU.getBestDateTimePattern(dateFormat, l.toString());

            final String fmt = DateFormat.getBestDateTimePattern(l, dateFormat);

            mDateFormat = new SimpleDateFormat(fmt, l);

        }