Redefinition of Macro removed
[platform/upstream/iotivity.git] / resource / csdk / connectivity / samples / android / casample / cAInterface / src / main / java / org / iotivity / ca / CaNfcInterface.java
2016-03-07 Harish Kumara MarappaMerge branch 'simulator'.
2016-02-29 Markus JungMerge branch 'resource-container'
2016-02-26 Jee Hyeok KimMerge branch 'master' into cloud-interface
2016-02-25 Madan LankaMerge "Merge branch 'master' into group-manager" into...
2016-02-24 Jihun HaMerge branch 'master' into group-manager
2016-02-19 lankamadanMerge "Merge branch 'master' into easysetup" into easysetup
2016-02-19 lankamadanMerge branch 'master' into easysetup
2016-02-19 Ashok ChannaMerge branch 'nfc-transport'