Merge branch 'tizen_3.0' into tizen_4.0

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

Thu, 16 Aug 2018 08:43:39 +0000 (10:43 +0200)

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

Thu, 16 Aug 2018 08:43:39 +0000 (10:43 +0200)
author Piotr Kosko <p.kosko@samsung.com>
Thu, 16 Aug 2018 08:43:39 +0000 (10:43 +0200)
committer Piotr Kosko <p.kosko@samsung.com>
Thu, 16 Aug 2018 08:43:39 +0000 (10:43 +0200)
diff --cc packaging/webapi-plugins.spec
Simple merge
diff --cc src/humanactivitymonitor/humanactivitymonitor_api.js
Simple merge
diff --cc src/nfc/nfc_api.js
Simple merge
diff --cc src/systeminfo/systeminfo_api.js
Simple merge
author	Piotr Kosko <p.kosko@samsung.com>
	Thu, 16 Aug 2018 08:43:39 +0000 (10:43 +0200)
committer	Piotr Kosko <p.kosko@samsung.com>
	Thu, 16 Aug 2018 08:43:39 +0000 (10:43 +0200)
		1	2
packaging/webapi-plugins.spec	patch \|	diff1 \|	diff2 \|	blob \| history
src/humanactivitymonitor/humanactivitymonitor_api.js	patch \|	diff1 \|	diff2 \|	blob \| history
src/nfc/nfc_api.js	patch \|	diff1 \|	diff2 \|	blob \| history
src/systeminfo/systeminfo_api.js	patch \|	diff1 \|	diff2 \|	blob \| history