Merge branch 'master' into 'security-CKM' branch.
[platform/upstream/iotivity.git] / android / android_api / base / jni / JniOcPlatform.cpp
2015-08-03 Sachin AgrawalMerge branch 'master' into 'security-CKM' branch.
2015-08-01 Erich KeaneFixed a few SonarQube identified issues
2015-07-30 Tim KourtFixed a merge of OcConnectivityType and OcConnectivityFlags
2015-07-30 Ossama OthmanClean up some SonarQube warnings (trailing whitespace...
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...
2015-07-03 hunje.yeonMerge branch 'master' into resource-manipulation
2015-07-01 Rahul RahulAdded platform information to the android code, as...
2015-06-04 hunje.yeonMerge branch 'master' into resource-manipulation
2015-05-26 Mandeep ShettyAdded support for device discovery at oic/d.
2015-05-15 Tim KourtAndroid Base API merge to master