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

Chunk
Conflicting content 
package android.text;

<<<<<<< HEAD
import com.google.android.collect.Lists;

import android.test.MoreAsserts;
=======
import android.graphics.Paint;
import android.os.Parcel;
>>>>>>> f395e3042accd7f3f5df466dbb532befcd1db5d4
import android.test.suitebuilder.annotation.LargeTest;
import android.test.suitebuilder.annotation.SmallTest;
import android.text.style.StyleSpan;
Solution content 
package android.text;

import com.google.android.collect.Lists;

import android.test.MoreAsserts;
import android.os.Parcel;
import android.test.suitebuilder.annotation.LargeTest;
import android.test.suitebuilder.annotation.SmallTest;
import android.text.style.StyleSpan;
File
TextUtilsTest.java
Developer's decision
Combination
Kind of conflict
Import