Projects >> android_packages_apps_Trebuchet >>90abcc94258ba9d9c8b68ac9764b6ab1eba12985

Chunk
Conflicting content 
<<<<<<< HEAD
=======
import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
import android.animation.AnimatorSet;
import android.animation.ObjectAnimator;
>>>>>>> 0ede734d0780a968c9c345f99a18f9f8b9fc02cd
import android.animation.TimeInterpolator;
import android.animation.ValueAnimator;
import android.animation.ValueAnimator.AnimatorUpdateListener;
Solution content 
import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
import android.animation.AnimatorSet;
import android.animation.ObjectAnimator;
import android.animation.TimeInterpolator;
import android.animation.ValueAnimator;
import android.animation.ValueAnimator.AnimatorUpdateListener;
File
CellLayout.java
Developer's decision
Version 2
Kind of conflict
Import