Merge "Fix wifi network strings shown in Settings." into mnc-dev

    <!-- Wifi Display settings. The dropdown menu title for choosing operating channel during certification process. [CHAR LIMIT=40] -->

    <string name="wifi_display_operating_channel" translatable="false">Operating channel</string>

    <!-- Wifi 2.4GHz is used as an universal itendifier for 2.4GHz band -->

    <string name="wifi_band_24ghz" translatable="false">2.4GHz</string>

    <string name="wifi_band_24ghz">2.4 GHz</string>

    <!-- Wifi Internal 5GHz as an universal itendifier for 5GHz band -->

    <string name="wifi_band_5ghz" translatable="false">5GHz</string>

    <string name="wifi_band_5ghz">5 GHz</string>

    <!-- Link speed on Wifi Status screen -->

    <string name="link_speed">%1$d Mbps</string>

    <!-- Wifi Alert message when tapping on a preference for a config locked down by device owner. [CHAR LIMIT=200] -->

    <string name="wifi_alert_lockdown_by_device_owner"><xliff:g id="app_name">%1$s</xliff:g> manages your device and has disabled modifying and deleting this Wi-Fi network. For more information, contact your administrator.</string>

                    WifiInfo info = mAccessPoint.getInfo();

                    if (info != null && info.getLinkSpeed() != -1) {

                        addRow(group, R.string.wifi_speed, info.getLinkSpeed()

                                + WifiInfo.LINK_SPEED_UNITS);

                        addRow(group, R.string.wifi_speed, String.format(

                                res.getString(R.string.link_speed), info.getLinkSpeed()));

                    }

                    if (info != null && info.getFrequency() != -1) {