Merge branch 'beehome' of snicker.com.cn:icsupport into beehome

diff --cc app/debug/output.json
index 0000000,0000000..d2561fa
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/app/debug/output.json
@@@ -1,0 -1,0 +1,1 @@@
++[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":392,"versionName":"2004071059","enabled":true,"outputFile":"ICSer_V392_2004071059_debug.apk","fullName":"debug","baseName":"debug"},"path":"ICSer_V392_2004071059_debug.apk","properties":{}}]

diff --cc app/release/output.json
index 0000000,0000000..bb650b0
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/app/release/output.json
@@@ -1,0 -1,0 +1,1 @@@
++[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":460,"versionName":"2007231643","enabled":true,"outputFile":"ICSer_V460_2007231643_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V460_2007231643_release.apk","properties":{}}]

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

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