From: k.liang <liangkang648253071@126.com>
Date: Thu, 7 Oct 2021 09:20:35 +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=1d88639ebc18449b35d03197e4940d929f312d83;p=icsupport.git

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

# Conflicts:
#	app/version_code.properties
---

1d88639ebc18449b35d03197e4940d929f312d83