resolved conflicts for merge of 23682809 to lmp-mr1-dev-plus-aosp

Change-Id: Ia6ad086dad93e5230ec59287d96e736e8d785320

diff --cc src/com/android/settings/RadioInfo.java
index 7aac59b,a296564..77927d9
--- 1/src/com/android/settings/RadioInfo.java
--- 2/src/com/android/settings/RadioInfo.java
+++ b/src/com/android/settings/RadioInfo.java
@@@ -17,6 -17,8 +17,7 @@@
  package com.android.settings;
  
  import android.app.Activity;
 -import android.content.Context;
+ import android.app.QueuedWork;
  import android.content.Intent;
  import android.content.pm.PackageManager;
  import android.content.pm.ResolveInfo;
@@@ -54,8 -56,13 +55,11 @@@ import com.android.internal.telephony.P
  import com.android.internal.telephony.PhoneFactory;
  import com.android.internal.telephony.PhoneStateIntentReceiver;
  import com.android.internal.telephony.TelephonyProperties;
 -import org.apache.http.HttpResponse;
 -import org.apache.http.client.HttpClient;
 -import org.apache.http.client.methods.HttpGet;
 -import org.apache.http.impl.client.DefaultHttpClient;
+ import com.android.ims.ImsConfig;
+ import com.android.ims.ImsException;
+ import com.android.ims.ImsManager;
 +import java.net.HttpURLConnection;
 +import java.net.URL;
  
  import java.io.IOException;
  import java.net.UnknownHostException;