Merge branch 'master' into extended-easysetup
[platform/upstream/iotivity.git] / android / android_api / base / src / main / java / org /
drwxr-xr-x   ..
drwxr-xr-x - iotivity