From: cc <ch79.cho@samsung.com>
Date: Thu, 8 Sep 2016 01:29:09 +0000 (+0900)
Subject: Merge remote-tracking branch 'origin/master' into notification-service
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e39b3483d5f9314a0e56b93afe69ad40c57747a4;p=contrib%2Fiotivity.git

Merge remote-tracking branch 'origin/master' into notification-service

Change-Id: I46af88cce1a821841baa1fe3f5226537ae1eb83b
Signed-off-by: cc <ch79.cho@samsung.com>
---

e39b3483d5f9314a0e56b93afe69ad40c57747a4