| Chunk |
|---|
| Conflicting content |
|---|
private static final int MAGIC = 0xBA757475; // 'BATSTATS'
// Current on-disk Parcel version
<<<<<<< HEAD
private static final int VERSION = 67 + (USE_OLD_HISTORY ? 1000 : 0);
=======
private static final int VERSION = 66 + (USE_OLD_HISTORY ? 1000 : 0);
>>>>>>> dbccd44a638ae8705a5b14bff8b2dd74abc26045
// Maximum number of items we will record in the history.
private static final int MAX_HISTORY_ITEMS = 2000; |
| Solution content |
|---|
private static final int MAGIC = 0xBA757475; // 'BATSTATS'
// Current on-disk Parcel version
private static final int VERSION = 67 + (USE_OLD_HISTORY ? 1000 : 0);
// Maximum number of items we will record in the history.
private static final int MAX_HISTORY_ITEMS = 2000; |
| File |
|---|
| BatteryStatsImpl.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Chunk |
|---|
| Conflicting content |
|---|
import android.content.pm.Signature; import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.ResolveInfo; <<<<<<< HEAD import android.content.pm.UserInfo; import android.net.ProxyProperties; ======= import android.net.ProxyProperties; import android.content.pm.UserInfo; >>>>>>> dbccd44a638ae8705a5b14bff8b2dd74abc26045 import android.net.Uri; import android.os.AsyncTask; import android.os.Binder; |
| Solution content |
|---|
import android.content.pm.Signature; import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.ResolveInfo; import android.content.pm.UserInfo; import android.net.ProxyProperties; import android.net.Uri; import android.os.AsyncTask; import android.os.Binder; |
| File |
|---|
| DevicePolicyManagerService.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Import |