Merge branch 'devel/tizen_3.0' into tizen 65/74865/1 accepted/tizen/common/20160617.121310 accepted/tizen/ivi/20160617.083248 accepted/tizen/mobile/20160617.083115 accepted/tizen/tv/20160617.083014 accepted/tizen/wearable/20160617.083102 submit/tizen/20160616.101029
authorkibak.yoon <kibak.yoon@samsung.com>
Thu, 16 Jun 2016 02:22:28 +0000 (11:22 +0900)
committerkibak.yoon <kibak.yoon@samsung.com>
Thu, 16 Jun 2016 02:22:32 +0000 (11:22 +0900)
commitbc6b0e382fb2fe36ff7d64d19b77526dfb9fdcea
tree644bae053376e7d086866422e8dcec46b9137ebb
parent22ed2de125ff4d3d42b9a0ff50407bab949cc7c6
parent914dc11319c2baec518c5778c501a0a664ac13eb
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>