sinthuja 7ddf1483b8 Merge branch 'wso2-master' ... # Conflicts: # features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature/pom.xml # features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.ui.feature/pom.xml		2017-05-09 12:09:22 +05:30
src/main	resolved device type download issue in windows OS and added log support for service clients.	2017-03-02 00:32:39 +05:30
pom.xml	Merge branch 'wso2-master'	2017-05-09 12:09:22 +05:30