Merge remote-tracking branch 'origin/WJC' into NewFilePath

wei

2020-12-24 8413f493d6e527c3f71cf704c6b22212e94a6c60

1
2
3
4
5
<?xml version="1.0" encoding="UTF-8"?>
<resources>
    <string name="app_name">HDL_ON_Pro</string>
    <string name="action_settings">Settings</string>
</resources>