Merge branch 'master' into extended-easysetup
[platform/upstream/iotivity.git] / service / easy-setup / mediator / richsdk / android / EasySetupCore / src / main / java / org / iotivity / service / easysetup / mediator / EasySetupStatus.java
2016-04-11 David AntlerMerge branch 'master' into windows-port
2016-03-07 Harish Kumara MarappaMerge branch 'simulator'.
2016-03-07 Jee Hyeok KimMerge "Merge branch 'master' into cloud-interface"...
2016-03-07 Jee Hyeok KimMerge branch 'master' into cloud-interface
2016-03-07 Jihun HaMerge branch 'group-manager'
2016-03-05 lankamadanMerge "Merge branch 'easysetup'"
2016-03-04 lankamadanMerge branch 'easysetup'
2016-02-19 lankamadanMerge branch 'master' into easysetup
2016-02-15 Jay SharmaRestructuring of the easy-setup service.