From: Piotr Kosko <p.kosko@samsung.com>
Date: Fri, 2 Mar 2018 09:09:42 +0000 (+0100)
Subject: Merge branch 'tizen_3.0' into tizen_4.0
X-Git-Tag: submit/tizen/20180514.095841~4^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f4f0a33a8a66006a086ec35d6868d78c8f1c7979;p=platform%2Fcore%2Fapi%2Fcordova-plugins.git

Merge branch 'tizen_3.0' into tizen_4.0

Conflicts:
	packaging/cordova-api.spec

Change-Id: I6ce9327e17645c3af41d0409aa8e49175a5e104c
---

f4f0a33a8a66006a086ec35d6868d78c8f1c7979