Projects >> platform_frameworks_base >>f0108cda21bec61418b24aa6217406072780b5d5

Chunk
Conflicting content 
package android.content;

<<<<<<< HEAD
=======
import com.android.internal.os.AtomicFile;
import com.android.internal.util.ArrayUtils;
import com.android.common.FastXmlSerializer;

>>>>>>> ad2fa35d888e0763bfef0fc060775bec5d169479
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import org.xmlpull.v1.XmlSerializer;
Solution content 
package android.content;

import com.android.internal.os.AtomicFile;
import com.android.internal.util.ArrayUtils;
import com.android.common.FastXmlSerializer;

import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import org.xmlpull.v1.XmlSerializer;
File
SyncStorageEngine.java
Developer's decision
Version 2
Kind of conflict
Import