From: kibak.yoon <kibak.yoon@samsung.com>
Date: Thu, 7 Jul 2016 02:27:54 +0000 (+0900)
Subject: Merge branch 'devel/tizen_3.0' into tizen
X-Git-Tag: accepted/tizen/common/20160708.141021^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=626f940a05656f771d73208b1a9b99fc59ab8b0f;p=platform%2Fcore%2Fapi%2Fsensor.git

Merge branch 'devel/tizen_3.0' into tizen

* 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>
---

626f940a05656f771d73208b1a9b99fc59ab8b0f