| Chunk |
|---|
| Conflicting content |
|---|
import android.os.Registrant; import android.os.Handler; import android.os.AsyncResult; <<<<<<< HEAD ======= import android.os.SystemProperties; import android.util.Config; >>>>>>> 74af525e400bb9da80082b1bd6beea3ea0e5a7de import android.util.Log; /** |
| Solution content |
|---|
import android.os.Registrant; import android.os.Handler; import android.os.AsyncResult; import android.os.SystemProperties; import android.util.Log; /** |
| File |
|---|
| BaseCommands.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Import |