From: k.liang <liangkang648253071@126.com>
Date: Thu, 21 Oct 2021 09:37:27 +0000 (+0800)
Subject: Merge remote-tracking branch 'origin/mqtt_test' into mqtt_test
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=48f88506a94d88fb8343a6a84cf70c87a0c3492d;p=icsupport.git

Merge remote-tracking branch 'origin/mqtt_test' into mqtt_test

# Conflicts:
#	app/release/output.json
#	app/version_code.properties
---

48f88506a94d88fb8343a6a84cf70c87a0c3492d