From: TrillGates <williamtrillgates@gmail.com>
Date: Thu, 1 Jul 2021 08:14:46 +0000 (+0800)
Subject: merge files.
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=d617541005b8e7fcfe9533b5a2e602ebad19bd31;p=icsupport.git

merge files.
---

d617541005b8e7fcfe9533b5a2e602ebad19bd31
diff --cc .gitignore
index 94c7a234,94c7a234..38bb84bf
--- a/.gitignore
+++ b/.gitignore
@@@ -4,3 -4,3 +4,4 @@@ buil
  .idea/
  .gradle/
  import-summary.txt
++local.properties
diff --cc app/version_code.properties
index a387cbd6,413bcf10..1b0c5080
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@@ -1,2 -1,2 +1,1 @@@
- #Wed Jun 30 12:09:33 CST 2021
- VERSION_CODE=881
 -#Wed Jun 30 14:29:27 CST 2021
 -VERSION_CODE=880
++VERSION_CODE=881
diff --cc local.properties
index f88edb60,553ff13e..3ff6dd52
--- a/local.properties
+++ b/local.properties
@@@ -4,5 -4,4 +4,5 @@@
  # Location of the SDK. This is only used by Gradle.
  # For customization when using a Version Control System, please read the
  # header note.
 -sdk.dir=C\:\\Users\\incar\\AppData\\Local\\Android\\Sdk
 +#Tue Jun 29 20:13:18 CST 2021
- sdk.dir=E\:\\Android\\Sdk
++sdk.dir=E\:\\Android\\Sdk