Merge branch 'tizen_4.0' into tizen

author Piotr Kosko <p.kosko@samsung.com>

Wed, 28 Mar 2018 11:44:26 +0000 (13:44 +0200)

committer Piotr Kosko <p.kosko@samsung.com>

Wed, 28 Mar 2018 11:45:33 +0000 (13:45 +0200)
author Piotr Kosko <p.kosko@samsung.com>
Wed, 28 Mar 2018 11:44:26 +0000 (13:44 +0200)
committer Piotr Kosko <p.kosko@samsung.com>
Wed, 28 Mar 2018 11:45:33 +0000 (13:45 +0200)
diff --cc packaging/webapi-plugins.spec
Simple merge
diff --cc src/application/application_manager.cc
Simple merge
diff --cc src/content/content_manager.cc
Simple merge
author	Piotr Kosko <p.kosko@samsung.com>
	Wed, 28 Mar 2018 11:44:26 +0000 (13:44 +0200)
committer	Piotr Kosko <p.kosko@samsung.com>
	Wed, 28 Mar 2018 11:45:33 +0000 (13:45 +0200)
		1	2
packaging/webapi-plugins.spec	patch \|	diff1 \|	diff2 \|	blob \| history
src/application/application_manager.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/content/content_manager.cc	patch \|	diff1 \|	diff2 \|	blob \| history