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

wei

2021-01-21 bee4133c05f9c41f24ec7fa7449faabb79306087

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>