请合并最新的代码

xm

2020-03-23 115c3071ec765bed679d4b083d6799a1edb6fba6

1
2
3
4
5
<?xml version="1.0" encoding="utf-8"?>
<resources>
    <string name="hello">Hello World, Click Me!</string>
    <string name="app_name">GateWay.Droid</string>
</resources>