Projects >> platform_frameworks_base >>839458d8d4dbf44cd1778a23471cf8f948a2012c

Chunk
Conflicting content 
import android.view.ViewGroup.LayoutParams;
import android.view.accessibility.AccessibilityEvent;
import android.widget.AdapterView;
<<<<<<< HEAD
=======
import android.widget.FrameLayout;
>>>>>>> e03952c042c4ee72a96b485e445b944748aa2212
import android.widget.LinearLayout;

import com.android.internal.app.ActionBarImpl;
Solution content 
import android.view.ViewGroup.LayoutParams;
import android.view.accessibility.AccessibilityEvent;
import android.widget.AdapterView;
import android.widget.FrameLayout;
import android.widget.LinearLayout;

import com.android.internal.app.ActionBarImpl;
File
Activity.java
Developer's decision
Version 2
Kind of conflict
Import