From: Piotr Kosko Date: Wed, 27 Sep 2017 11:26:28 +0000 (+0200) Subject: Merge branch 'tizen_3.0' into tizen_4.0 X-Git-Tag: submit/tizen_4.0/20170927.114247^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=abb2180dab36e30adff8bc0280e23918ed12098e;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git Merge branch 'tizen_3.0' into tizen_4.0 Conflicts: packaging/webapi-plugins.spec Change-Id: I4396c1ca3a1415cfbe4cd9ca0edc9351b5053615 --- abb2180dab36e30adff8bc0280e23918ed12098e