1127最新合并代码，合并嘉乐更新

wei

2020-11-27 e53a1951d6aa07ad22aad9816da4703496fcbccd

 HDL-ON_Android/Resources/values/strings.xml

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<resources>
    <string name="app_name">HDL_ON_Android</string>
    <string name="app_name">HDL_ON_Pro</string>
    <string name="action_settings">Settings</string>
</resources>