From: Piotr Kosko <p.kosko@samsung.com>
Date: Fri, 6 Apr 2018 09:04:22 +0000 (+0200)
Subject: Merge branch 'tizen_3.0' into tizen_4.0
X-Git-Tag: submit/tizen/20180406.100350^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3add7aa4dabea244c5b70e04e89cbec8c4d75a24;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git

Merge branch 'tizen_3.0' into tizen_4.0

Conflicts:
	src/download/download_instance.cc
	src/download/download_instance.h

Change-Id: Idd927480881807d231e7edf17319e092e8ded81c
---

3add7aa4dabea244c5b70e04e89cbec8c4d75a24