Merge remote-tracking branch 'origin/wjc' into release0123

wxr

2022-07-04 cc7eb0553e93844be984045bca3e335d4ae0dede

1
2
3
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
</adaptive-icon>