Merge branch 'CJL'

wxr

2020-11-23 135e148183e066795c487c62ef387ba40a621efd

1
2
3
4
<?xml version="1.0" encoding="utf-8"?>
<network-security-config>
    <base-config cleartextTrafficPermitted="true"/>
</network-security-config>