Merge "Merge branch 'easysetup'"
authorlankamadan <lanka.madan@samsung.com>
Sat, 5 Mar 2016 04:34:02 +0000 (04:34 +0000)
committerGerrit Code Review <gerrit@172.30.200.205>
Sat, 5 Mar 2016 04:34:02 +0000 (04:34 +0000)
commitd63f63f4aae3b14661d1b9f1db113cc213162780
tree2c701ffbbde89227f66a2950bae835828c591eb4
parent9a66fb46498e3055ea09bd01a7f3ea3fb8441f7d
parentcf56a410a2150ae474c676e7e6d01b89552a4873
Merge "Merge branch 'easysetup'"
service/resource-encapsulation/unittests/DiscoveryManagerTest.cpp
tools/tizen/.gbs.conf