Merge branch 'master' into extended-easysetup
authorJihun Ha <jihun.ha@samsung.com>
Sun, 24 Jul 2016 12:30:03 +0000 (21:30 +0900)
committerJihun Ha <jihun.ha@samsung.com>
Sun, 24 Jul 2016 12:30:03 +0000 (21:30 +0900)
commit8cdaa91d823c3db73ef0d513863fd67d728bc418
tree8425353876e5e8477e5a2de892a84020a6702932
parentcd8dfe8406343eb1bd2b48f96169eec1874890bb
parent6a34b94f142cfa1fc352ffab0e2541d9dc9e9a79
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 <jihun.ha@samsung.com>