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

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

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

Change-Id: I44ed020c30bd3c59b3c5d29802f25f397d639463
parents 4f85628f d1ec74f5

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 -->