From: Hun-je Yeon <hunje.yeon@samsung.com>
Date: Mon, 8 Aug 2016 23:41:11 +0000 (+0900)
Subject: Merge remote-tracking branch 'origin/master' into notification-service
X-Git-Tag: 1.2.0+RC1~52^2~81^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4f9a573f29b6e3d77aff2d395076458fb24e9448;p=platform%2Fupstream%2Fiotivity.git

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

Change-Id: I3902e34d97aa063f3ef7714e4409f854766c21cd
Signed-off-by: Hun-je Yeon <hunje.yeon@samsung.com>
---

4f9a573f29b6e3d77aff2d395076458fb24e9448