From: k.liang <liangkang648253071@126.com>
Date: Tue, 28 Dec 2021 03:06:36 +0000 (+0800)
Subject: Merge remote-tracking branch 'origin/mqtt_test' into mqtt_test
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=68f97e261a56172e78b2824fe7a6c1197994919d;p=icsupport.git

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

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

68f97e261a56172e78b2824fe7a6c1197994919d