From: Hun-je Yeon <hunje.yeon@samsung.com>
Date: Mon, 25 Jul 2016 11:08:05 +0000 (+0900)
Subject: Merge branch 'master' into notification-service
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7b017138673175a8a5891b242efca8ed44227349;p=contrib%2Fiotivity.git

Merge branch 'master' into notification-service

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

7b017138673175a8a5891b242efca8ed44227349