From: Jihun Ha Date: Sun, 24 Jul 2016 12:30:03 +0000 (+0900) Subject: Merge branch 'master' into extended-easysetup X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8cdaa91d823c3db73ef0d513863fd67d728bc418;p=contrib%2Fiotivity.git Merge branch 'master' into extended-easysetup Conflicts: service/easy-setup/mediator/csdk/src/provisioning.cpp service/easy-setup/mediator/csdk/src/provisioningapi.cpp service/easy-setup/mediator/csdk/src/wifiprovisioning.cpp Change-Id: I80e0b7917869577e0716516fa95d9c21c7290cc7 Signed-off-by: Jihun Ha --- 8cdaa91d823c3db73ef0d513863fd67d728bc418