Merge branch 'master' into resource-manipulation
[platform/upstream/iotivity.git] / resource / android /
drwxr-xr-x   ..
-rw-r--r-- 2472 OCAndroid.cpp
-rw-r--r-- 1033 SConscript