PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of f90b5141 to master

Browse Source 
Change-Id: I666b2fcde034f6dc9f7b69409facf88a4feb5309
This commit is contained in:
Elliott Hughes
2014-04-24 17:24:35 -07:00
parent 4f700a3b3c f90b514144
commit 57d7fa545b
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/ChooseLockGeneric.java
View File

@@ -30,6 +30,7 @@ import android.preference.Preference;
import android.preference.PreferenceScreen;
import android.security.KeyStore;
import android.util.EventLog;
import android.util.MutableBoolean;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -39,8 +40,6 @@ import com.android.internal.widget.LockPatternUtils;
import java.util.List;
import libcore.util.MutableBoolean;
public class ChooseLockGeneric extends SettingsActivity {
@Override