Merge remote-tracking branch 'upstream/pr1114' into apache-master
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/62439cae Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/62439cae Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/62439cae Branch: refs/heads/master Commit: 62439cae0be8689dec47dad5ca1189a7f48eb8bf Parents: 467840a ee16722 Author: misakuo <[email protected]> Authored: Sat Apr 28 10:45:43 2018 +0800 Committer: misakuo <[email protected]> Committed: Sat Apr 28 10:45:43 2018 +0800 ---------------------------------------------------------------------- .../com/taobao/weex/ui/component/WXVContainer.java | 17 ++++++++++++++++- .../java/com/taobao/weex/utils/BoxShadowUtil.java | 6 ++++-- test/pages/css/border.vue | 9 +++++++++ 3 files changed, 29 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/62439cae/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java ----------------------------------------------------------------------
