merge files.

diff --cc app/src/main/AndroidManifest.xml
Simple merge

diff --cc app/src/main/java/com/enqualcomm/support/CoreService.java
Simple merge

diff --cc app/src/main/java/com/enqualcomm/support/bean/Runtime.java
Simple merge

diff --cc app/version_code.properties
index 3234721,279c2e8..f652d3b
--- 1/app/version_code.properties
--- 2/app/version_code.properties
+++ b/app/version_code.properties
@@@ -1,5 -1,5 +1,2 @@@
 -#Mon Jun 28 22:42:14 CST 2021
 ->>>>>>>=b405d1184f3616d4e894d199cee0eb91613a68db
 -VERSION_CODE=879
 -=\=\=\=\=\=\=
 -<<<<<<<=HEAD
 +#Tue Jun 29 19:41:46 CST 2021\r
- >>>>>>>=b405d1184f3616d4e894d199cee0eb91613a68db\r
- VERSION_CODE=880\r
- <<<<<<<=HEAD\r
- =\=\=\=\=\=\=\r
++VERSION_CODE=880