Merge branch 'devel/tizen_3.0' into tizen 05/78805/1 accepted/tizen/common/20160708.141021 accepted/tizen/ivi/20160709.015010 accepted/tizen/mobile/20160709.014948 accepted/tizen/tv/20160709.015014 accepted/tizen/wearable/20160709.014959 submit/tizen/20160708.084014
authorkibak.yoon <kibak.yoon@samsung.com>
Thu, 7 Jul 2016 02:27:54 +0000 (11:27 +0900)
committerkibak.yoon <kibak.yoon@samsung.com>
Thu, 7 Jul 2016 02:28:01 +0000 (11:28 +0900)
* devel/tizen_3.0:
  capi-sensor: mapping heart rate/sleep state key for recorder api

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

Trivial merge