resolved conflicts for merge of 4d9f670b to stage-aosp-master

Change-Id: Ia5bb368dbbd857c6e201b821ae7c03a9f6f5006b

diff --cc src/com/android/settings/wifi/WifiConfigController.java
index 587197b,a2b76e4..90aef86
--- 1/src/com/android/settings/wifi/WifiConfigController.java
--- 2/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@@ -49,11 -49,11 +49,11 @@@ import android.widget.AdapterView
  import android.widget.ArrayAdapter;
  import android.widget.Button;
  import android.widget.CheckBox;
 +import android.widget.CompoundButton;
++import android.widget.CompoundButton.OnCheckedChangeListener;
  import android.widget.EditText;
  import android.widget.Spinner;
  import android.widget.TextView;
 -import android.widget.CompoundButton;
--import android.widget.CompoundButton.OnCheckedChangeListener;
  
  import com.android.settings.ProxySelector;
  import com.android.settings.R;