Update and resolve conflict of service SConscript
[platform/upstream/iotivity.git] / resource / c_common / oic_malloc / test /
drwxr-xr-x   ..
-rw-r--r-- 2166 SConscript
drwxr-xr-x - linux