Merge "[UTC][IoTCon][ACR-646][Modify name from resource_properties to resource_polici...
authorJaeKyung Lee <jk79.lee@samsung.com>
Wed, 8 Jun 2016 00:25:23 +0000 (17:25 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Wed, 8 Jun 2016 00:25:23 +0000 (17:25 -0700)
1  2 
src/utc/iotcon/tct-iotcon-core_common_iot.h
src/utc/iotcon/tct-iotcon-core_mobile.h
src/utc/iotcon/tct-iotcon-core_tv.h
src/utc/iotcon/tct-iotcon-core_wearable.h
src/utc/iotcon/utc-iotcon-remote-resource.c
src/utc/iotcon/utc-iotcon-resource.c

Simple merge
Simple merge