Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-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/5e342b4b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5e342b4b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5e342b4b

Branch: refs/heads/0.16-dev
Commit: 5e342b4b0546a36be2b7b2ee65d8c093b7544525
Parents: 9314f30 0e9760a
Author: misakuo <misa...@apache.org>
Authored: Mon Sep 25 11:13:42 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Mon Sep 25 11:13:42 2017 +0800

----------------------------------------------------------------------
 .../java/com/taobao/weex/common/Constants.java  |   1 +
 .../taobao/weex/ui/component/WXComponent.java   |  63 ++-
 .../com/taobao/weex/utils/BoxShadowUtil.java    | 510 +++++++++++++++++++
 .../com/taobao/weex/utils/WXResourceUtils.java  |   4 +
 test/screenshot/border-android.png              | Bin 162929 -> 0 bytes
 5 files changed, 575 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


Reply via email to