Projects >> android_frameworks_base >>d36263fa3eb79bf9c28b457c9656af76d676fc2c

Chunk
Conflicting content 
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
<<<<<<< HEAD
=======
import android.content.res.Configuration;
>>>>>>> 90177e59e5211dd9ab33761ce800e8a86a49d1e2
import android.content.res.Resources;
import android.content.res.TypedArray;
import android.graphics.drawable.Drawable;
Solution content 
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.content.res.Resources;
import android.content.res.TypedArray;
import android.graphics.drawable.Drawable;
File
ActionBarView.java
Developer's decision
Version 1
Kind of conflict
Import