From: Piotr Kosko <p.kosko@samsung.com>
Date: Thu, 18 Jan 2018 12:35:15 +0000 (+0100)
Subject: Merge branch 'tizen_3.0' into tizen_4.0
X-Git-Tag: submit/tizen_4.0/20180122.134957^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F01%2F167601%2F2;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git

Merge branch 'tizen_3.0' into tizen_4.0

Conflicts:
	src/filesystem/filesystem_file.cc

Change-Id: I0360e670aefd456dd14b93948c1f2e3e4640e88e
---

c5c6640990b973077e7bde015bb523a7e8a705b4