Merge branch 'master' into 'security-CKM' branch.
[platform/upstream/iotivity.git] / android / android_api / base / jni / JniOcSecurity.h
2015-07-16 hunje.yeonMerge branch 'master' into resource-manipulation
2015-07-15 Sachin AgrawalMerge "Merge 'security-basecamp' branch into master...
2015-07-15 Sachin AgrawalMerge 'security-basecamp' branch into master with CBOR
2015-07-13 Sachin AgrawalImplemented C++/Android API for OCRegisterPersistentSto...