Merge "Merge 'security-basecamp' branch into master with CBOR"
[platform/upstream/iotivity.git] / android / android_api / base / src / main / java / org / iotivity / base / OcPlatformInfo.java
2015-07-15 Sachin AgrawalMerge 'security-basecamp' branch into master with CBOR
2015-07-01 Rahul RahulAdded platform information to the android code, as...