Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC

gxc

2020-01-10 c0021397eeb8335d6d1f20990c71533c3d94e7af

 ZigbeeApp/DroidLib/DroidLib.csproj

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

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

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

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

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

  </ItemGroup>

  <ItemGroup>

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