Merge branch 'master' into resource-manipulation
[platform/upstream/iotivity.git] / android / android_api / base / src / main /
drwxr-xr-x   ..
-rwxr-xr-x 1725 AndroidManifest.xml
drwxr-xr-x - java