Merge branch 'CJL'

wxr

2020-12-16 d3123778d722597ee43c23879ce131ebf340393f

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