From: Piotr Kosko <p.kosko@samsung.com>
Date: Fri, 17 Nov 2017 10:28:43 +0000 (+0100)
Subject: Merge branch 'tizen_3.0' into tizen_4.0
X-Git-Tag: submit/tizen_4.0/20171117.110318~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=86d05f93738e89c04830f9b6aef141dc8b148e9b;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git

Merge branch 'tizen_3.0' into tizen_4.0

Conflicts:
	src/humanactivitymonitor/humanactivitymonitor_manager.cc

Change-Id: Iae74a00bd144f06f0bd6aed5ee881019c5a0bc1e
---

86d05f93738e89c04830f9b6aef141dc8b148e9b