Projects >> android-frameworks-base-with-screenshot-tweaks >>c849fbcf3ddd3cbb08840c72f7f325294c5d2802

Chunk
Conflicting content 
import android.widget.ImageButton;
import android.widget.LinearLayout;

<<<<<<< HEAD:packages/Keyguard/src/com/android/keyguard/KeyguardFaceUnlockView.java
=======
import com.android.internal.R;
>>>>>>> 5856ee4bd620fcbabc5f52651875d034d1513c5b:policy/src/com/android/internal/policy/impl/keyguard/KeyguardFaceUnlockView.java
import com.android.internal.widget.LockPatternUtils;

import java.lang.Math;
Solution content 
import android.widget.ImageButton;
import android.widget.LinearLayout;

import com.android.internal.widget.LockPatternUtils;

import java.lang.Math;
File
KeyguardFaceUnlockView.java
Developer's decision
Version 1
Kind of conflict
Import