Projects >> android-frameworks-base-with-remote-control-service >>5aa1c034d9bfdb2744f637c4686adf20a7ed9975

Chunk
Conflicting content 
import com.android.dumprendertree.forwarder.ForwardService;

import android.content.Intent;
<<<<<<< HEAD
=======
import android.os.Bundle;
import android.os.Environment;
>>>>>>> 8a76a9085dbbca87b4c172577ca264d8b5f2ab32
import android.test.ActivityInstrumentationTestCase2;
import android.util.Log;
Solution content 
import com.android.dumprendertree.forwarder.ForwardService;

import android.content.Intent;
import android.os.Environment;
import android.test.ActivityInstrumentationTestCase2;
import android.util.Log;
File
LayoutTestsAutoTest.java
Developer's decision
Combination
Kind of conflict
Import