Snicker Git - protocol_srv.git/commit

Merge remote-tracking branch 'origin/mqtt_test' into mqtt_test

# Conflicts:
# app/version_code.properties
# local.properties

app/src/main/java/com/enqualcomm/support/CoreService.java	diff1 \|	diff2 \|	blob \| history
app/src/main/java/com/ic/protocols/protocol_fzd.java	diff1 \|	diff2 \|	blob \| history
app/version_code.properties	diff1 \|	diff2 \|	blob \| history

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

app/src/main/java/com/enqualcomm/support/CoreService.java	diff1 \|	diff2 \|	blob \| history
app/src/main/java/com/ic/protocols/protocol_fzd.java	diff1 \|	diff2 \|	blob \| history
app/version_code.properties	diff1 \|	diff2 \|	blob \| history