Merge remote-tracking branch 'origin/mqtt_test' into mqtt_test
authork.liang <liangkang648253071@126.com>
Fri, 30 Jul 2021 03:46:09 +0000 (11:46 +0800)
committerk.liang <liangkang648253071@126.com>
Fri, 30 Jul 2021 03:46:09 +0000 (11:46 +0800)
commit5f51bf2df85287a25b7d8eb65f2c0519e263b35a
tree7fecdb8b077e0f9ec480a7dff1da5d505ba27d39
parent257f8a10c76392fb8713d0142e764dcd73a06816
parent4812bd0407b3617b9c3d6e452e6cc8fd43535b8a
Merge remote-tracking branch 'origin/mqtt_test' into mqtt_test

# Conflicts:
# app/release/output.json
# app/version_code.properties
app/src/main/java/com/enqualcomm/support/bean/Runtime.java
app/src/main/java/com/ic/protocols/protocolAPIHelper.java