Projects >> platform_frameworks_base >>627975fca234bfc62d60904547ba3fb2ac675ec8

Chunk
Conflicting content 
import android.text.style.StyleSpan;
import android.util.Log;
import android.util.TypedValue;
<<<<<<< HEAD
=======
import android.view.LayoutInflater;
>>>>>>> 74890df7267d1c203fdbc5e90052f723a3c89f3d
import android.view.WindowManager;
import android.widget.Button;
import android.widget.CheckBox;
Solution content 
import android.text.style.StyleSpan;
import android.util.Log;
import android.util.TypedValue;
import android.view.WindowManager;
import android.widget.CheckBox;
File
MediaProjectionPermissionActivity.java
Developer's decision
Version 1
Kind of conflict
Import