Merge branch 'simulator'
[platform/upstream/iotivity.git] / service / resource-encapsulation / android / android_api.iml
2015-09-19 Harish Kumara MarappaMerge branch 'simulator'
2015-09-19 Younghyun JooMerge branch 'master' into resource-encapsulation
2015-09-19 coderhymeRefactoring the android api for resorce-encapsulation.