From: Piotr Kosko <p.kosko@samsung.com>
Date: Fri, 27 Apr 2018 05:01:04 +0000 (+0200)
Subject: Merge branch 'tizen_4.0' into HEAD
X-Git-Tag: submit/tizen/20180427.125243~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F67%2F177267%2F2;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git

Merge branch 'tizen_4.0' into HEAD

Conflicts:
	src/power/power_manager.cc
	src/power/power_manager.h

Change-Id: If92f51de4cae01ace304a007bddf63e23ac84d94
---

78d60bb59ff669ef733730dd3e0c20399a3ca4a4