Projects >> packages_apps_Settings >>57d7fa545b792f2fa97cc6aad0e9f466ba415ffe

Chunk
Conflicting content 
import java.util.List;

<<<<<<< HEAD
import libcore.util.MutableBoolean;

public class ChooseLockGeneric extends SettingsActivity {
=======
public class ChooseLockGeneric extends PreferenceActivity {
>>>>>>> f90b5141447b39aff01d1b821e46cf7da918e1aa

    @Override
    public Intent getIntent() {
Solution content 
import java.util.List;

public class ChooseLockGeneric extends SettingsActivity {

    @Override
    public Intent getIntent() {
File
ChooseLockGeneric.java
Developer's decision
Combination
Kind of conflict
Class signature
Import