Merge branch 'devel/tizen' into tizen 56/155556/1 accepted/tizen/unified/20171016.064440 submit/tizen/20171013.144027
authorkibak.yoon <kibak.yoon@samsung.com>
Fri, 13 Oct 2017 13:34:31 +0000 (22:34 +0900)
committerkibak.yoon <kibak.yoon@samsung.com>
Fri, 13 Oct 2017 13:34:35 +0000 (22:34 +0900)
* devel/tizen:
  sensor-recorder: restore CtxJson to prevent crash issue
  Revert "Replace the glib-json wrapper CtxJson with jsoncpp"

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

Trivial merge