Merge branch 'master' into easysetup
[iotivity.git] / service / easy-setup / sampleapp / mediator / android / EasySetup / app / src / main / java / org / iotivity / service / easysetup / MainActivity.java
2016-05-18 Jihun HaMerge branch 'master' into easysetup 03/8203/1
2016-04-05 Jay Sharma[Easy-Setup] Fixed JIRA issue IOT-1064 47/7547/2
2016-03-28 lankamadan[Easy-setup] Fixed Security feature 13/6313/3
2016-03-24 Jay Sharma[Easy-Setup][IOT-1016] Fixed Jira issue. 71/6271/2
2016-03-08 lankamadan[Mediator] Removed hard-coded Secure Flag from android... 49/5449/5
2016-03-07 Harish Kumara MarappaMerge branch 'simulator'. 87/5487/1
2016-03-07 Jay Sharma[Mediator] Removed hard-coded Secure Flag from android... 73/5473/2
2016-03-07 Jee Hyeok KimMerge "Merge branch 'master' into cloud-interface"...
2016-03-07 Jee Hyeok KimMerge branch 'master' into cloud-interface 83/5383/3
2016-03-07 Jihun HaMerge branch 'group-manager' 71/5471/1
2016-03-05 Jay Sharma[Mediator] Removed hard-coded Secure Flag from android... 41/5441/2
2016-03-05 lankamadanMerge "Merge branch 'easysetup'"
2016-03-04 lankamadanMerge branch 'easysetup' 13/5413/4
2016-03-01 saurabh.s9IoTivity Security bug fix and enable security api usage... 81/5181/13
2016-02-26 Jee Hyeok KimMerge branch 'master' into cloud-interface 37/5137/9
2016-02-19 lankamadanMerge branch 'master' into easysetup 69/5069/1
2016-02-11 Jay Sharma[Mediator]Java SDK for the new C++ APIs 69/4969/2
2016-02-01 Jay Sharma[Android] Mediator changes to support softAP at enrolll... 89/4889/2
2015-11-12 lankamadanMerge branch 'master' into easysetup 63/4163/3
2015-10-12 Harish Kumara MarappaMerge branch 'master' into simulator 35/3835/1
2015-10-08 lankamadan[easy-setup] Android package name changed for sdk 83/3683/2
2015-10-05 Joseph MorrowMerge branch 'plugin-interface' into master 09/3509/1
2015-10-02 Vinil JainAdded JUnit test case 63/3363/4
2015-09-30 Habib VirjiMerge Resource Directory into the master 49/2749/5
2015-09-28 Hemant MahskyAdded Multi PHY EasySetup Service 29/3229/4
2015-09-28 Hemant MahskyModification for SoftAP Onboarding cleanup 07/3207/4
2015-09-23 Hemant MahskyRefactored Sample App and directory structure as per... 71/2871/9