Merge branch 'mqtt_test' into sl8540_common
authorSnickerSun <scy@incartech.cn>
Fri, 6 Aug 2021 12:24:28 +0000 (20:24 +0800)
committerSnickerSun <scy@incartech.cn>
Fri, 6 Aug 2021 12:24:28 +0000 (20:24 +0800)
1  2 
app/src/main/AndroidManifest.xml
app/src/main/java/com/enqualcomm/support/CoreService.java

Simple merge