Merge branch 'sl8541_common' of server-git:incartech/protocol_srv into sl8541_common
authorTrillGates <williamtrillgates@gmail.com>
Fri, 27 Aug 2021 06:21:34 +0000 (14:21 +0800)
committerTrillGates <williamtrillgates@gmail.com>
Fri, 27 Aug 2021 06:21:34 +0000 (14:21 +0800)
commitfddd4059a9a9a6d3a288b09a7b53daf64cf2e7e6
treec771e73bbf72567d9e609a8db034f66baed231ad
parent7f1d25b6e17b021a7b1575a518cd999186ebee84
parent17461070192109dc595d87c05be2b805dff9d39d
Merge branch 'sl8541_common' of server-git:incartech/protocol_srv into sl8541_common
app/src/main/AndroidManifest.xml
app/src/main/java/com/ic/protocolSrv/Config.java
app/src/main/java/com/ic/protocols/protocol_fzd.java