Merge "Hide APNs with type="ia" and apn=""" into lmp-mr1-dev

automerge: a8b78f9

* commit 'a8b78f96ae9e06759a38c19fa625cb980d578c35':
  Hide APNs with type="ia" and apn=""

src/com/android/settings/ApnSettings.java

@@ -209,7 +209,7 @@ public class ApnSettings extends SettingsPreferenceFragment implements
         Log.d(TAG, "mccmnc = " + mccmnc);
         final String where = "numeric=\""
             + mccmnc
-            + "\"";
+            + "\" AND NOT (type='ia' AND (apn=\"\" OR apn IS NULL))";
 
         Cursor cursor = getContentResolver().query(Telephony.Carriers.CONTENT_URI, new String[] {
                 "_id", "name", "apn", "type"}, where, null,