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

wei

2020-12-23 35c4bc03ee8da50317cd3f33e9f52f0a4259affd

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>