From: Mu-Woong Lee <muwoong.lee@samsung.com>
Date: Fri, 9 Jun 2017 12:56:38 +0000 (+0900)
Subject: Merge branch 'devel/tizen' into tizen
X-Git-Tag: submit/tizen/20170609.130020^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F99%2F133299%2F1;p=platform%2Fcore%2Fcontext%2Fcontext-service.git

Merge branch 'devel/tizen' into tizen

* devel/tizen:
  Dependency cleanup: add service & client manipulation classes
  Rename the class Json to avoid symbol conflicts with Jsoncpp

Change-Id: I2ddf197183652f5738a7b3595d0da73e2524b1bb
Signed-off-by: Mu-Woong Lee <muwoong.lee@samsung.com>
---

72a76af9eb0c34907e60955b25dcf54c869c085b