Merge branch 'master' into simulator
[platform/upstream/iotivity.git] / service / simulator / java / eclipse-plugin / ServiceProviderPlugin / src / oic / simulator / serviceprovider / manager /
drwxr-xr-x   ..
-rw-r--r-- 8642 LogManager.java
-rw-r--r-- 47020 ResourceManager.java