Fixed a merge of OcConnectivityType and OcConnectivityFlags
[platform/upstream/iotivity.git] / android / android_api / base / src / main / java / org / iotivity / base / OcResource.java
2015-07-30 Tim KourtFixed a merge of OcConnectivityType and OcConnectivityFlags
2015-07-15 Sachin AgrawalMerge 'security-basecamp' branch into master with CBOR
2015-07-10 hunje.yeonMerge branch 'master' into resource-manipulation
2015-07-09 Rahul RahulUpdated android code based on OcConnectivityType change...
2015-05-20 Ossama OthmanRemoved executable bit from non-executable files.
2015-05-15 Tim KourtAndroid Base API merge to master