Projects >> android-frameworks-base-with-screenshot-tweaks >>af728bd201195799c8e993ece145d607b9ca67df

Chunk
Conflicting content 
package android.app;

import android.R;
<<<<<<< HEAD
import android.os.BatteryStats;
import android.os.IBinder;
=======
>>>>>>> 5b45f2366e97d8c937950285d4dc936fed15d00a
import com.android.internal.app.IUsageStats;
import com.android.internal.os.PkgUsageStats;
import com.android.internal.os.TransferPipe;
Solution content 
package android.app;

import android.R;
import android.os.BatteryStats;
import android.os.IBinder;
import com.android.internal.app.IUsageStats;
import com.android.internal.os.PkgUsageStats;
import com.android.internal.os.TransferPipe;
File
ActivityManager.java
Developer's decision
Version 1
Kind of conflict
Import