Merge "Modify name from resource_properties to resource_policies" into tizen
authorsung.goo.kim <sung.goo.kim@samsung.com>
Thu, 2 Jun 2016 02:52:17 +0000 (19:52 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Thu, 2 Jun 2016 02:52:17 +0000 (19:52 -0700)
1  2 
doc/iotcon_doc.h
test/iotcon-test-basic-server.c
test/iotcon-test-iface-server.c

Simple merge
Simple merge
Simple merge