merge from open-source master

import android.content.DialogInterface.OnClickListener;

import android.os.Bundle;

import android.text.TextUtils.TruncateAt;

import android.text.format.DateFormat;

import android.view.LayoutInflater;

import android.view.View;

import android.widget.DatePicker;

        mCalendar = Calendar.getInstance();

        updateTitle(mInitialYear, mInitialMonth, mInitialDay);

        setButton(context.getText(R.string.date_time_set), this);

        setButton2(context.getText(R.string.cancel), (OnClickListener) null);

        setButton(BUTTON_POSITIVE, context.getText(R.string.date_time_set), this);

        setButton(BUTTON_NEGATIVE, context.getText(R.string.cancel), (OnClickListener) null);

        setIcon(R.drawable.ic_dialog_time);

        LayoutInflater inflater =