projects / platform / core / context / sensor-recorder.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6510729 5e67e6d)
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)
commita92bac67ab9027b2391a64902047d0da84ea3416
tree58da136d577882f5fa54a0a2272eeedff21596f6tree | snapshot
parent6510729377655efee8070cdce2dcff72b8eaa5cecommit | diff
parent5e67e6d4e7fd9278a161e37516eba8e239d5a6becommit | diff
Merge branch 'devel/tizen' into tizen

* 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>
Domain: Service Framework / Context; Licenses: Apache-2.0;