Merge branch 'master' into 'security-CKM' branch.
[platform/upstream/iotivity.git] / android / android_api / base / jni / JniOnPlatformInfoListener.cpp
2015-07-15 Sachin AgrawalMerge 'security-basecamp' branch into master with CBOR
2015-07-03 hunje.yeonMerge branch 'master' into resource-manipulation
2015-07-01 Rahul RahulAdded platform information to the android code, as...