Merge branch 'master' into group-manager
[platform/upstream/iotivity.git] / resource / csdk / connectivity / src / nfc_adapter /
2016-02-24 Jihun HaMerge branch 'master' into group-manager
2016-02-24 Jaehong JoRemoved warning for BT, NFC
2016-02-19 Ashok ChannaMerge branch 'nfc-transport'