合并 v_3.0代码

2017-04-05 18:16:02 +08:00
parent 2557f14d70 b6b32e266c
commit 99d857f338
113 changed files with 5430 additions and 2497 deletions
--- a/Aria/build.gradle
+++ b/Aria/build.gradle
@ -7,8 +7,8 @@ android {
  defaultConfig {
    minSdkVersion 9
    targetSdkVersion 23
-    versionCode 86
-    versionName "2.4.2"
+    versionCode 100
+    versionName "3.0.0"
  }
  buildTypes {
    release {