Merge branch 'devel/tizen_3.0' into tizen 78/54778/1
authorkibak.yoon <kibak.yoon@samsung.com>
Fri, 18 Dec 2015 01:44:16 +0000 (10:44 +0900)
committerkibak.yoon <kibak.yoon@samsung.com>
Fri, 18 Dec 2015 01:44:25 +0000 (10:44 +0900)
commitd174a5de2738c57a0db25aea3ea9875beeb5f852
tree28379453fbbce6912585acb658ccfc9d17f3b64f
parentdf9b34f55071227ece8fa4e02e44e489c2d46faf
parent6c69885ea6bf28c4047f83c34b6221ce42b8c0bb
Merge branch 'devel/tizen_3.0' into tizen

* devel/tizen_3.0:
  sensord: sensord version up to 2.0.0
  Revert "sensord: extra data embedding"

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