Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-11-14 a7adf98ff4ac801342853b1f9231cc1ab5acebf3

 ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs

old mode 100755
new mode 100644