From: k.liang <liangkang648253071@126.com>
Date: Wed, 23 Feb 2022 09:36:26 +0000 (+0800)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=2835913bd3516e34c9df2730198c7c5332e4829f;p=IcTemperature.git

Merge remote-tracking branch 'origin/master'

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

2835913bd3516e34c9df2730198c7c5332e4829f