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

wei

2020-12-22 bac00b1bc932d3a85f90986466757b24d9407d61

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>