Merge branch 'upstream' into tizen accepted/tizen/common/20160422.171753
[platform/upstream/iotivity.git] / resource / android /
drwxr-xr-x   ..
-rw-r--r-- 2472 OCAndroid.cpp
-rw-r--r-- 945 SConscript