Fixed bug while merging iotcon discovery results 64/85264/1
authorkmook <kmook.choi@samsung.com>
Wed, 24 Aug 2016 09:34:54 +0000 (18:34 +0900)
committerkmook <kmook.choi@samsung.com>
Wed, 24 Aug 2016 09:34:54 +0000 (18:34 +0900)
commit44774e9aceaebe9343f38196c0ffe059ebbeb5b8
treefc672a755f597dd64cf8bcfe905e71bbb4c4b5da
parenta9df5845efcb48fbc1bf37444041300773a3fe76
Fixed bug while merging iotcon discovery results

Change-Id: Iecc5e33251f78d2b5c611e6935c35ba9a007846a
Signed-off-by: kmook <kmook.choi@samsung.com>
daemon/DiscoveryManager.cpp
daemon/IDevice.h
daemon/discovery_provider/iotcon/DeviceAdapter.cpp
daemon/discovery_provider/iotcon/DeviceAdapter.h