Merge remote-tracking branch 'origin/master'

yy1717

2020-03-05 f430073ef8e63884eff78d57084f89e93fa0c1f0

1
2
3
4
5
6
7
<?xml version="1.0" encoding="utf-8"?>
<resources>
    <string-array name="spinnerarr">
        <item>张三</item>
        <item>李四</item>
    </string-array>
</resources>