From: kibak.yoon <kibak.yoon@samsung.com>
Date: Thu, 16 Jun 2016 02:22:28 +0000 (+0900)
Subject: Merge branch 'devel/tizen_3.0' into tizen
X-Git-Tag: submit/tizen/20160616.101029^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bc6b0e382fb2fe36ff7d64d19b77526dfb9fdcea;p=platform%2Fcore%2Fapi%2Fsensor.git

Merge branch 'devel/tizen_3.0' into tizen

* devel/tizen_3.0:
  capi-sensor: add a space between parameters
  capi-system-sensor: update api version for HRM sensor types
  sensord: delete the duplicated manifest file and clean up spec file
  capi-system-sensor: clean up CMakeLists.txt and package config file

Change-Id: Ia4c2b3f3edd6408df82099fd9258836ebc73b46a
Signed-off-by: kibak.yoon <kibak.yoon@samsung.com>
---

bc6b0e382fb2fe36ff7d64d19b77526dfb9fdcea