Merge branch 'devel/tizen' into tizen 94/133294/1 accepted/tizen/unified/20170609.204938 submit/tizen/20170609.130020
authorMu-Woong Lee <muwoong.lee@samsung.com>
Fri, 9 Jun 2017 12:53:28 +0000 (21:53 +0900)
committerMu-Woong Lee <muwoong.lee@samsung.com>
Fri, 9 Jun 2017 12:53:28 +0000 (21:53 +0900)
commit0f09c26216bdafc09c3a3bf4bda7cbc87de0772e
treefa5933a794cd821a23addddffdc2df615fd15a58
parent193b0492e6739f28b283d8e0c5626b3e7f8d42d0
parentc1ed46a69bae273c6f87bb4969865ac29bc00037
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 <muwoong.lee@samsung.com>