Merge branch 'devel/tizen' into tizen 00/133300/1 accepted/tizen/unified/20170609.204941 submit/tizen/20170609.130020
authorMu-Woong Lee <muwoong.lee@samsung.com>
Fri, 9 Jun 2017 12:57:04 +0000 (21:57 +0900)
committerMu-Woong Lee <muwoong.lee@samsung.com>
Fri, 9 Jun 2017 12:57:04 +0000 (21:57 +0900)
commitbf0289d86c6ba3fe7dcf5aba0d7ca5e167ff6b10
treec393bf48067f7f9bb0661309ba60ccbd63ae3521
parent2fe611b38456d53402980bda3af52c64094a74b8
parent6d536034cac2d2169a629f1207c64a4ddd7016e7
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>