merge in mnc-release history after reset to mnc-dev
diff --git a/src/java/com/android/ims/ImsManager.java b/src/java/com/android/ims/ImsManager.java
index 9ef8942..eb78fd0 100644
--- a/src/java/com/android/ims/ImsManager.java
+++ b/src/java/com/android/ims/ImsManager.java
@@ -306,10 +306,8 @@
         if (imsManager != null) {
             try {
                 ImsConfig config = imsManager.getConfigInterface();
-                // FIXME: replace NETWORK_TYPE_LTE with NETWORK_TYPE_IWLAN
-                // when available
                 config.setFeatureValue(ImsConfig.FeatureConstants.FEATURE_TYPE_VOICE_OVER_WIFI,
-                        TelephonyManager.NETWORK_TYPE_LTE,
+                        TelephonyManager.NETWORK_TYPE_IWLAN,
                         enabled ? ImsConfig.FeatureValueConstants.ON
                                 : ImsConfig.FeatureValueConstants.OFF, null);