From: k.liang <liangkang648253071@126.com>
Date: Fri, 15 Oct 2021 03:18:47 +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=84ed1c8251610784afc19165d2b0188abad2ac2e;p=icsupport.git

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

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

84ed1c8251610784afc19165d2b0188abad2ac2e