Projects >> platform_frameworks_base >>e4ca30503cb428f030fe52f429dac0119acfa170

Chunk
Conflicting content 
import android.os.RemoteException;
import android.os.ServiceManager;
import android.os.SystemProperties;
<<<<<<< HEAD
import android.text.TextUtils;
=======
>>>>>>> b3ce4b1b7896fc22ac3fe1e06a61481f13f2d364
import android.util.Log;
import android.view.WindowManagerGlobal;
Solution content 
import android.os.RemoteException;
import android.os.ServiceManager;
import android.os.SystemProperties;
import android.text.TextUtils;
import android.util.Log;
import android.view.WindowManagerGlobal;
File
WallpaperManager.java
Developer's decision
Version 1
Kind of conflict
Import