From: Hun-je Yeon <hunje.yeon@samsung.com>
Date: Tue, 17 May 2016 01:33:08 +0000 (+0900)
Subject: Merge branch 'master' into notification-service
X-Git-Tag: 1.2.0+RC1~52^2~173
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=705120561e5ffb4788f36ad27f62dd46c45ab470;p=platform%2Fupstream%2Fiotivity.git

Merge branch 'master' into notification-service

update the lastest changes of master branch into notification-service branch

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

705120561e5ffb4788f36ad27f62dd46c45ab470