| Chunk |
|---|
| Conflicting content |
|---|
import android.content.res.Configuration; import android.database.ContentObserver; import android.media.AudioService; <<<<<<< HEAD import android.os.Build; ======= >>>>>>> 14d151bf41736b8f8e4f13c72a2c612286257c99 import android.os.Looper; import android.os.RemoteException; import android.os.ServiceManager; |
| Solution content |
|---|
import android.content.res.Configuration; import android.database.ContentObserver; import android.media.AudioService; import android.os.Build; import android.os.Looper; import android.os.RemoteException; import android.os.ServiceManager; |
| File |
|---|
| SystemServer.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
import android.os.StrictMode; import android.os.SystemClock; import android.os.SystemProperties; <<<<<<< HEAD ======= import android.provider.Contacts.People; >>>>>>> 14d151bf41736b8f8e4f13c72a2c612286257c99 import android.provider.Settings; import android.server.BluetoothA2dpService; import android.server.BluetoothService; |
| Solution content |
|---|
import android.os.StrictMode; import android.os.SystemClock; import android.os.SystemProperties; import android.provider.Contacts.People; import android.provider.Settings; import android.server.BluetoothA2dpService; import android.server.BluetoothService; |
| File |
|---|
| SystemServer.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Import |