am c8ed7857: Get Email units to compile in mr2 branch

* commit 'c8ed7857613373646d472bba86f678fc5084e4b0':
  Get Email units to compile in mr2 branch
This commit is contained in:
Jerry Xie 2014-03-20 22:16:38 +00:00 committed by Android Git Automerger
commit 3710b79a2b
2 changed files with 4 additions and 4 deletions

View File

@ -196,11 +196,11 @@ public class AccountSetupIncomingTests extends
HostAuth auth = account.getOrCreateHostAuthRecv(context);
HostAuth.setHostAuthFromString(auth, storeUriString);
Bundle extras = new Bundle();
extras.putParcelable(SetupData.EXTRA_SETUP_DATA, new SetupData(SetupData.FLOW_MODE_NORMAL, account));
/*Bundle extras = new Bundle();
extras.putParcelable(SetupData.EXTRA_SETUP_DATA, new SetupData(SetupData.FLOW_MODE_NORMAL, account));*/
Intent intent = new Intent(Intent.ACTION_MAIN);
intent.putExtras(extras);
// intent.putExtras(extras);
return intent;
}

View File

@ -28,7 +28,7 @@ import android.widget.SpinnerAdapter;
import com.android.email.R;
import com.android.email.activity.setup.AccountSetupOptions;
import com.android.email.activity.setup.SetupDataFragment;
//import com.android.email.activity.setup.SetupDataFragment;
import com.android.email.activity.setup.SpinnerOption;
import com.android.emailcommon.provider.Account;
import com.android.emailcommon.provider.HostAuth;