Merge "Merge branch 'easysetup'"

author lankamadan <lanka.madan@samsung.com>

Sat, 5 Mar 2016 04:34:02 +0000 (04:34 +0000)

committer Gerrit Code Review <gerrit@172.30.200.205>

Sat, 5 Mar 2016 04:34:02 +0000 (04:34 +0000)
author lankamadan <lanka.madan@samsung.com>
Sat, 5 Mar 2016 04:34:02 +0000 (04:34 +0000)
committer Gerrit Code Review <gerrit@172.30.200.205>
Sat, 5 Mar 2016 04:34:02 +0000 (04:34 +0000)
diff --cc service/resource-encapsulation/unittests/DiscoveryManagerTest.cpp
Simple merge
diff --cc tools/tizen/.gbs.conf

index 88e8cf9,9235ad7..88e8cf9

mode 100644,100755..100755
--- 1/tools/tizen/.gbs.conf
--- 2/tools/tizen/.gbs.conf
+++ b/tools/tizen/.gbs.conf
author	lankamadan <lanka.madan@samsung.com>
	Sat, 5 Mar 2016 04:34:02 +0000 (04:34 +0000)
committer	Gerrit Code Review <gerrit@172.30.200.205>
	Sat, 5 Mar 2016 04:34:02 +0000 (04:34 +0000)
		1	2
service/resource-encapsulation/unittests/DiscoveryManagerTest.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
tools/tizen/.gbs.conf	patch \|	diff1 \|	diff2 \|	blob \| history