Merge branch 'tizen_3.0' into tizen

author Lukasz Bardeli <l.bardeli@samsung.com>

Wed, 9 Aug 2017 09:06:50 +0000 (11:06 +0200)

committer Lukasz Bardeli <l.bardeli@samsung.com>

Wed, 9 Aug 2017 09:28:55 +0000 (11:28 +0200)
author Lukasz Bardeli <l.bardeli@samsung.com>
Wed, 9 Aug 2017 09:06:50 +0000 (11:06 +0200)
committer Lukasz Bardeli <l.bardeli@samsung.com>
Wed, 9 Aug 2017 09:28:55 +0000 (11:28 +0200)
diff --cc packaging/webapi-plugins.spec
Simple merge
diff --cc src/sensor/sensor_api.js
Simple merge
diff --cc src/sensor/sensor_service.cc
Simple merge
author	Lukasz Bardeli <l.bardeli@samsung.com>
	Wed, 9 Aug 2017 09:06:50 +0000 (11:06 +0200)
committer	Lukasz Bardeli <l.bardeli@samsung.com>
	Wed, 9 Aug 2017 09:28:55 +0000 (11:28 +0200)
		1	2
packaging/webapi-plugins.spec	patch \|	diff1 \|	diff2 \|	blob \| history
src/sensor/sensor_api.js	patch \|	diff1 \|	diff2 \|	blob \| history
src/sensor/sensor_service.cc	patch \|	diff1 \|	diff2 \|	blob \| history