Redefinition of Macro removed
[platform/upstream/iotivity.git] / resource / csdk / connectivity / samples / android / casample / sampleService / src / main / java / org / iotivity / ca / service / FileChooser.java
2016-02-26 Jee Hyeok KimMerge branch 'master' into cloud-interface
2015-11-12 lankamadanMerge branch 'master' into easysetup
2015-09-28 Sachin AgrawalMerge branch 'security-CKM' into 'master'
2015-09-25 K.J. KaoMerge branch 'remote-access2'
2015-09-20 Habib VirjiUpdate RD with latest master
2015-09-19 Dmitrii ZhuravlevMerge branch 'security-CKM' into 'master'
2015-09-18 Madan LankaMerge "Merge branch 'master' into simulator" into simulator
2015-09-18 Harish Kumara MarappaMerge branch 'master' into simulator
2015-09-16 Patrick LankswertMerge "Merge easysetup branch into master"
2015-09-16 Sachin AgrawalMerge branch 'master' into security-summit
2015-09-16 Madan LankaMerge "Merge branch 'master' into resource-encapsulatio...
2015-09-15 hunje.yeonMerge branch 'master' into resource-encapsulation
2015-09-11 jihwan.seoUpdated Android Sample App for block-wise transfer