| Chunk |
|---|
| Conflicting content |
|---|
import com.android.internal.util.XmlUtils; import com.android.server.EventLogTags; import com.android.server.IntentResolver; <<<<<<< HEAD:services/core/java/com/android/server/pm/PackageManagerService.java import com.android.server.ServiceThread; import com.android.server.LocalServices; ======= >>>>>>> f2db00fdcd4e3dd97afd071f3af058d307a152f9:services/java/com/android/server/pm/PackageManagerService.java import com.android.server.Watchdog; import org.xmlpull.v1.XmlPullParser; |
| Solution content |
|---|
import com.android.internal.util.XmlUtils; import com.android.server.EventLogTags; import com.android.server.IntentResolver; import com.android.server.LocalServices; import com.android.server.ServiceThread; import com.android.server.Watchdog; import com.android.server.storage.DeviceStorageMonitorInternal; import org.xmlpull.v1.XmlPullParser; |
| File |
|---|
| PackageManagerService.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
import dalvik.system.VMRuntime; import libcore.io.IoUtils; <<<<<<< HEAD:services/core/java/com/android/server/pm/PackageManagerService.java import com.android.internal.R; import com.android.server.storage.DeviceStorageMonitorInternal; ======= >>>>>>> f2db00fdcd4e3dd97afd071f3af058d307a152f9:services/java/com/android/server/pm/PackageManagerService.java /** * Keep track of all those .apks everywhere. * |
| Solution content |
|---|
import dalvik.system.VMRuntime; import libcore.io.IoUtils; /** * Keep track of all those .apks everywhere. * |
| File |
|---|
| PackageManagerService.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Import |