Projects >> platform_frameworks_base >>d528d48e5d8444de0730d62b9f621b9cc2df5fbd

Chunk
Conflicting content 
import android.os.BatteryStats;
<<<<<<< HEAD
=======
import android.os.Binder;
import android.os.Bundle;
>>>>>>> c3eef19047b897bfb6e3cf42220d5146b187c66e
import android.os.IBinder;
import android.os.INetworkManagementService;
import android.os.Message;
import android.net.wifi.p2p.WifiP2pManager;
import android.net.wifi.p2p.WifiP2pService;
Solution content 
import android.net.wifi.p2p.WifiP2pManager;
import android.net.wifi.p2p.WifiP2pService;
import android.os.BatteryStats;
import android.os.Binder;
import android.os.Bundle;
import android.os.IBinder;
import android.os.INetworkManagementService;
import android.os.Message;
File
WifiStateMachine.java
Developer's decision
Version 2
Kind of conflict
Import