Merge cherrypicks of [5503807, 5503110, 5503120] into qt-release

Change-Id: Id697c1f9fcdf2cc1b5849a60296ac165c90490f8
This commit is contained in:
android-build-team Robot
2018-11-13 00:22:15 +00:00

View File

@@ -215,11 +215,11 @@
<string-array name="wifi_security">
<!-- The Wi-Fi network does not have any security. -->
<item>@string/wifi_security_none</item>
<item translatable="false">@string/wifi_security_owe</item>
<item translatable="false">@string/wifi_security_wep</item>
<item translatable="false">@string/wifi_security_psk_generic</item>
<item translatable="false">@string/wifi_security_sae</item>
<item translatable="false">@string/wifi_security_eap</item>
<item translatable="false">@string/wifi_security_owe</item>
<item translatable="false">@string/wifi_security_sae</item>
<item translatable="false">@string/wifi_security_eap_suiteb</item>
</string-array>