Merge remote-tracking branch 'upstream/0.11-dev' into 0.11-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/15b3a415 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/15b3a415 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/15b3a415 Branch: refs/heads/0.11-dev Commit: 15b3a415aec62d24eaac4b691503ef0f52cf5e8c Parents: c120eb9 5484be3 Author: acton393 <[email protected]> Authored: Mon Mar 13 10:32:52 2017 +0800 Committer: acton393 <[email protected]> Committed: Mon Mar 13 10:32:52 2017 +0800 ---------------------------------------------------------------------- android/sdk/assets/main.js | 14 +++---- .../java/com/taobao/weex/common/Constants.java | 1 + .../main/java/com/taobao/weex/dom/WXStyle.java | 40 ++++++++++---------- .../taobao/weex/ui/component/WXBaseRefresh.java | 10 ----- .../com/taobao/weex/ui/module/WXMetaModule.java | 4 +- .../java/com/taobao/weex/utils/WXViewUtils.java | 8 ++-- 6 files changed, 36 insertions(+), 41 deletions(-) ----------------------------------------------------------------------
