Merge branch 'master' into resource-encapsulation
[platform/upstream/iotivity.git] / service / resource-encapsulation / android / service / src / main / java / org / iotivity /
drwxr-xr-x   ..
drwxr-xr-x - service