Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm

xm

2020-05-07 c1de48884fa145a16a0f8bcee93274dcfaa0ff82

 ZigbeeApp/GateWay.Droid/Resources/xml/file_paths.xml

old mode 100644
new mode 100755