Merge branch 'devel/tizen_3.0' into tizen 26/76026/1 accepted/tizen/common/20160627.191141 accepted/tizen/ivi/20160623.121114 accepted/tizen/mobile/20160623.121001 accepted/tizen/tv/20160623.121041 accepted/tizen/wearable/20160623.121057 submit/tizen/20160622.045445
authorkibak.yoon <kibak.yoon@samsung.com>
Wed, 22 Jun 2016 10:59:49 +0000 (19:59 +0900)
committerkibak.yoon <kibak.yoon@samsung.com>
Wed, 22 Jun 2016 11:00:02 +0000 (20:00 +0900)
commit1d31e3f9247b3d44b4221e3c74142022566c331d
treefb8f27198e91e23234c5d794cba41cb4b60ab4c8
parenta62b2ca525b6f5462bfd63249ce1671d113be36d
parentfda09ec118138917b72afad8ab21f12988ce33e9
Merge branch 'devel/tizen_3.0' into tizen

* devel/tizen_3.0:
  sensord: fix the bug which converts wrong pause policy

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