From: Piotr Kosko <p.kosko@samsung.com>
Date: Wed, 18 Apr 2018 08:49:16 +0000 (+0200)
Subject: Merge branch 'tizen_3.0' into tizen_4.0
X-Git-Tag: submit/tizen_4.0/20180418.112525^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F06%2F176306%2F2;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git

Merge branch 'tizen_3.0' into tizen_4.0

Conflicts:
	src/application/application_manager.cc
	src/power/power.gyp

Change-Id: Ib9baaf8221cc99b01cfe8343b0e36a197c669941
---

088c3d856ac8a0ea8fb88523e33d812fd8c8d7ab