Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-11-14 a7adf98ff4ac801342853b1f9231cc1ab5acebf3

 ZigbeeApp/DroidLib/DroidLib.csproj

old mode 100644
new mode 100755
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>

<?xml version="1.0" encoding="utf-8"?>

<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

  <PropertyGroup>

    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

@@ -46,6 +46,7 @@
  <ItemGroup>

    <None Include="Additions\AboutAdditions.txt" />

    <None Include="Jars\AboutJars.txt" />

    <LibraryProjectZip Include="Jars\HDLElianZigBee20190917.aar" />

  </ItemGroup>

  <ItemGroup>

    <TransformFile Include="Transforms\EnumFields.xml" />