Snicker Git - protocol_srv.git/commit

author	SnickerSun <scy@incartech.cn>
	Fri, 6 Aug 2021 09:58:11 +0000 (17:58 +0800)
committer	SnickerSun <scy@incartech.cn>
	Fri, 6 Aug 2021 09:58:11 +0000 (17:58 +0800)
commit	f1cac638173f22d502e47561c773311beaacda05
tree	01ce1d2677428b9ae09882a29a0156121a574f2a	tree \| snapshot
parent	0cf1d51a6d382ee46827ef9dcbd42ffc86fb2505	commit \| diff
parent	0e3b588d2eca48873ede916636f199d10a10b8a9	commit \| diff

Merge branch 'mqtt_test' into sl8541_common

# Conflicts:
# app/src/main/java/com/enqualcomm/support/CoreService.java
# app/src/main/java/com/enqualcomm/support/utils/CellInfoUtil.java

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

app/src/main/AndroidManifest.xml	diff1 \|	diff2 \|	blob \| history
app/src/main/java/com/enqualcomm/support/CoreService.java	diff1 \|	diff2 \|	blob \| history
app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java	diff1 \|	diff2 \|	blob \| history
app/src/main/java/com/enqualcomm/support/utils/CellInfoUtil.java	diff1 \|	diff2 \|	blob \| history