Merge branch 'master' into windows-port
[platform/upstream/iotivity.git] / cloud / resourcedirectory / src / main / java / org / iotivity / cloud /
drwxr-xr-x   ..
drwxr-xr-x - rdserver