Projects >> android-frameworks-base-with-remote-control-service >>8a5f10b30dae663eb01372490df3497e8a2ad56a

Chunk
Conflicting content 
package com.android.server;

<<<<<<< HEAD
=======
import com.android.server.am.ActivityManagerService;
>>>>>>> f7b79151923ccde24a3c5cb546d9f595f0891f59
import com.android.internal.os.BinderInternal;
import com.android.internal.os.SamplingProfilerIntegration;
import com.android.server.am.ActivityManagerService;
Solution content 
package com.android.server;

import com.android.server.am.ActivityManagerService;
import com.android.internal.os.BinderInternal;
import com.android.internal.os.SamplingProfilerIntegration;
File
SystemServer.java
Developer's decision
Version 1
Kind of conflict
Import