You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by mi...@apache.org on 2017/08/15 09:51:35 UTC
[10/16] incubator-weex git commit: Merge remote-tracking branch
'remotes/upstream/0.16-dev' into android-feature-tracing
Merge remote-tracking branch 'remotes/upstream/0.16-dev' into android-feature-tracing
# Conflicts:
# android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java
# android/sdk/src/main/java/com/taobao/weex/dom/action/AbstractAddElementAction.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/d2587364
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/d2587364
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/d2587364
Branch: refs/heads/0.16-dev
Commit: d2587364e2fa97023891aa4042608828d00ce90f
Parents: 288d8b5
Author: misakuo <mi...@apache.org>
Authored: Thu Aug 10 14:53:07 2017 +0800
Committer: misakuo <mi...@apache.org>
Committed: Thu Aug 10 14:53:07 2017 +0800
----------------------------------------------------------------------
android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d2587364/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java b/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java
index 77969ee..98ad680 100644
--- a/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java
@@ -637,7 +637,6 @@ public class WXDomObject extends CSSNode implements Cloneable,ImmutableDomObject
}
public static @Nullable WXDomObject parse(JSONObject json, WXSDKInstance wxsdkInstance, WXDomObject parentDomObject){
- public static @Nullable WXDomObject parse(JSONObject json, WXSDKInstance wxsdkInstance){
long startNanos = System.nanoTime();
long timestamp = System.currentTimeMillis();
if (json == null || json.size() <= 0) {