From: Mu-Woong Lee Date: Fri, 9 Jun 2017 12:53:28 +0000 (+0900) Subject: Merge branch 'devel/tizen' into tizen X-Git-Tag: accepted/tizen/unified/20170609.204938^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0f09c26216bdafc09c3a3bf4bda7cbc87de0772e;p=platform%2Fcore%2Fcontext%2Fcontext-common.git Merge branch 'devel/tizen' into tizen * devel/tizen: Dependency cleanup: remove service & client base implementations Rename the class Json to avoid symbol conflicts with Jsoncpp Change-Id: Ie4bf74ae7551ccd80fe1a34d21efddf8b392add6 Signed-off-by: Mu-Woong Lee --- 0f09c26216bdafc09c3a3bf4bda7cbc87de0772e