Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a1fe638 authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge changes Ifdf54ace,Ib2c1d16d into rvc-dev am: d1ec74f5 am: 68288418 am: ca60d230 

Change-Id: I82c499e777ff3569aa254f011202754bf60c36d4
parents 76b9298f ca60d230

res/values/overlayable.xml

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ 
            <item type="integer" name="config_captive_portal_dns_probe_timeout"/>

            <item type="string" name="config_captive_portal_http_url"/>

            <item type="string" name="config_captive_portal_https_url"/>

            <item type="array" name="config_captive_portal_http_urls"/>

            <item type="array" name="config_captive_portal_https_urls"/>

            <item type="array" name="config_captive_portal_fallback_urls"/>

            <item type="bool" name="config_no_sim_card_uses_neighbor_mcc"/>

            <!-- Configuration value for DhcpResults -->