Merge branch 'master' into wjc

陈嘉乐

2021-03-26 d878a20366ed2aa0cf3a8e0a560441d1ff5f07af

1
2
3
4
5
<?xml version="1.0" encoding="utf-8"?>
<resources>
    <string name="hello">Hello World, Click Me!</string>
    <string name="app_name">ON</string>
</resources>