am 5482eca1: am 032ae72e: merge from open-source master

This commit is contained in:
The Android Open Source Project
2010-06-02 07:42:37 -07:00
committed by Android Git Automerger

View File

@@ -22,7 +22,6 @@ import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.util.Log;
import android.view.View;
import android.widget.EditText;