From a7adf98ff4ac801342853b1f9231cc1ab5acebf3 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 14 十一月 2019 17:25:42 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into DEV_GXC

---
 ZigbeeApp/GateWay.Droid/Assets/Phone/Navigation/Setting.png |    0 
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Navigation/Setting.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Navigation/Setting.png
index 3f4e259..ceb5bd0 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Phone/Navigation/Setting.png
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Navigation/Setting.png
Binary files differ

--
Gitblit v1.8.0