Merge branch 'master' into notification-service
[platform/upstream/iotivity.git] / service / notification / android / notification-service / src / main / java / org / iotivity / service / ns / consumer /
drwxr-xr-x   ..
-rwxr-xr-x 3409 ConsumerService.java
-rwxr-xr-x 2691 Provider.java