Merge remote-tracking branch 'remotes/upstream/release-0.16' into android-feature-text-rtl
# Conflicts: # android/sdk/src/main/java/com/taobao/weex/dom/WXTextDomObject.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/d6fee3a7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/d6fee3a7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/d6fee3a7 Branch: refs/heads/master Commit: d6fee3a7a1d62acba3d2a76410406f1a4a9e4390 Parents: c2db749 Author: misakuo <misa...@apache.org> Authored: Wed Oct 11 10:10:35 2017 +0800 Committer: misakuo <misa...@apache.org> Committed: Wed Oct 11 10:10:35 2017 +0800 ---------------------------------------------------------------------- .../sdk/src/main/java/com/taobao/weex/dom/WXTextDomObject.java | 3 --- 1 file changed, 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d6fee3a7/android/sdk/src/main/java/com/taobao/weex/dom/WXTextDomObject.java ---------------------------------------------------------------------- diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/WXTextDomObject.java b/android/sdk/src/main/java/com/taobao/weex/dom/WXTextDomObject.java index c66e1af..ce9c8c9 100644 --- a/android/sdk/src/main/java/com/taobao/weex/dom/WXTextDomObject.java +++ b/android/sdk/src/main/java/com/taobao/weex/dom/WXTextDomObject.java @@ -37,12 +37,9 @@ import android.text.TextUtils; import android.text.style.AbsoluteSizeSpan; import android.text.style.AlignmentSpan; import android.text.style.ForegroundColorSpan; -import android.util.Log; - import com.taobao.weex.WXEnvironment; import com.taobao.weex.common.Constants; -import com.taobao.weex.common.WXThread; import com.taobao.weex.dom.flex.CSSConstants; import com.taobao.weex.dom.flex.CSSNode; import com.taobao.weex.dom.flex.FloatUtil;
