Merge branch 'devel/tizen' into tizen 75/126175/1 accepted/tizen/unified/20170420.155849 submit/tizen/20170420.102501
authorkibak.yoon <kibak.yoon@samsung.com>
Thu, 20 Apr 2017 09:36:58 +0000 (18:36 +0900)
committerkibak.yoon <kibak.yoon@samsung.com>
Thu, 20 Apr 2017 09:37:04 +0000 (18:37 +0900)
commit1f32f1e9accaa03028a4439ed658ccbbcc741bd5
tree48d7bd997ad2ae30b36a1c62ff421251f1c719b0
parenteb921e2b41fe112a49b67bb555276fa3348d1476
parent072b5143699ac00788f8ea1583d8523cb1049ab5
Merge branch 'devel/tizen' into tizen

* devel/tizen:
  sensord: remove sleep() in new failed handler
  sensord: initialize cynara conf pointer to NULL
  sensord: sleep 100ms instead of a very short time
  sensord: replace usleep() code with sleep()
  sensord: remove unnecessary usleep()

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