Merge remote-tracking branch 'origin/extended-easysetup'
[platform/upstream/iotivity.git] / service / easy-setup / sampleapp / mediator / android / EasySetup / app / src / main / res / values / strings.xml
2016-08-11 Jihun HaMerge remote-tracking branch 'origin/extended-easysetup'
2016-08-08 Heewon ParkMerge branch 'master' into extended-easysetup
2016-08-04 Jihun HaMerge branch 'master' into extended-easysetup
2016-08-03 Jihun HaMerge branch 'master' into extended-easysetup
2016-07-31 Jihun HaMerge branch 'master' into extended-easysetup
2016-07-28 Jihun HaMerge branch 'master' into extended-easysetup
2016-07-24 Jihun HaMerge branch 'master' into extended-easysetup
2016-07-20 Jihun HaMerge branch 'master' into extended-easysetup
2016-07-18 uzchoiMerge remote-tracking branch 'origin/master' into exten...
2016-07-14 uzchoiMaster branch merge for VS build success
2016-07-13 Heewon Parkimplement Android sample App for mediator.
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-26 Jee Hyeok KimMerge branch 'master' into cloud-interface
2016-02-19 lankamadanMerge branch 'master' into easysetup
2016-02-01 Jay Sharma[Android] Mediator changes to support softAP at enrolll...
2015-11-12 lankamadanMerge branch 'master' into easysetup
2015-10-12 Harish Kumara MarappaMerge branch 'master' into simulator
2015-10-05 Joseph MorrowMerge branch 'plugin-interface' into master
2015-09-30 Habib VirjiMerge Resource Directory into the master
2015-09-28 Hemant MahskyAdded Multi PHY EasySetup Service
2015-09-23 Hemant MahskyRefactored Sample App and directory structure as per...