From: Mu-Woong Lee <muwoong.lee@samsung.com>
Date: Fri, 9 Jun 2017 12:57:04 +0000 (+0900)
Subject: Merge branch 'devel/tizen' into tizen
X-Git-Tag: accepted/tizen/unified/20170609.204941^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bf0289d86c6ba3fe7dcf5aba0d7ca5e167ff6b10;p=platform%2Fcore%2Fapi%2Fcontext.git

Merge branch 'devel/tizen' into tizen

* devel/tizen:
  Rename the class Json to avoid symbol conflicts with Jsoncpp

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

bf0289d86c6ba3fe7dcf5aba0d7ca5e167ff6b10