am 46c0a5b1: Merge "Remove unused imports in SecuritySettings.java"

Merge commit '46c0a5b12973fcd40b72b48fe344e45f1110865e' into gingerbread-plus-aosp

* commit '46c0a5b12973fcd40b72b48fe344e45f1110865e':
  Remove unused imports in SecuritySettings.java
This commit is contained in:
Jean-Baptiste Queru
2010-07-26 14:37:30 -07:00
committed by Android Git Automerger
2 changed files with 0 additions and 7 deletions

View File

@@ -20,7 +20,6 @@ package com.android.settings;
import java.util.Observable;
import java.util.Observer;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
import android.app.admin.DevicePolicyManager;
@@ -32,20 +31,16 @@ import android.content.Intent;
import android.database.Cursor;
import android.location.LocationManager;
import android.os.Bundle;
import android.os.SystemProperties;
import android.preference.CheckBoxPreference;
import android.preference.ListPreference;
import android.preference.Preference;
import android.preference.PreferenceActivity;
import android.preference.PreferenceCategory;
import android.preference.PreferenceManager;
import android.preference.PreferenceScreen;
import android.preference.Preference.OnPreferenceChangeListener;
import android.provider.Settings;
import android.security.Credentials;
import android.security.KeyStore;
import android.telephony.TelephonyManager;
import android.util.Log;
import android.view.View;
import android.widget.TextView;
import android.widget.Toast;

View File

@@ -16,8 +16,6 @@
package com.android.settings;
import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT;
import android.content.BroadcastReceiver;
import android.content.ContentResolver;
import android.content.Context;