Merge branch 'dev_5.25.0' into deploy

野松 · 野松 · commit 26c26a058e83 · 2017-06-15T20:32:11.000+08:00
diff --git a/Android/LuaViewSDK/src/com/taobao/luaview/global/SdkVersion.java b/Android/LuaViewSDK/src/com/taobao/luaview/global/SdkVersion.java
@@ -18,8 +18,10 @@ public class SdkVersion {
 
     public static final String V_051 = "0.5.1";
 
+    public static final String V_052 = "0.5.2";
+
     public static String getCurrent() {
-        return V_051;
+        return V_052;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,10 @@ public class SdkVersion {`
`18`	`18`
`19`	`19`	`public static final String V_051 = "0.5.1";`
`20`	`20`
	`21`	`+ public static final String V_052 = "0.5.2";`
	`22`	`+`
`21`	`23`	`public static String getCurrent() {`
`22`		`- return V_051;`
	`24`	`+ return V_052;`
`23`	`25`	`}`
`24`	`26`
`25`	`27`	`/**`