Merge branch 'V1.2.0' into develop_new

2020-07-27 18:00:04 +08:00
parent 416a9b61a4
commit 9606862628
17 changed files with 72 additions and 98 deletions
--- a/gradle.properties
+++ b/gradle.properties
@@ -21,5 +21,5 @@ with_jenkins=false
 #\u6253\u652F\u6301x86\u7684\u6A21\u62DF\u5668\u5305\u4F7F\u7528
 ndk_abi_filters=arm

-version_name=1.2.0
-version_code=120
+version_name=1.2.1
+version_code=121