sinthuja 37a15e927d Merge branch 'wso2-master' ... # Conflicts: # features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.backend.feature/pom.xml		2017-05-08 14:28:07 +05:30
..
org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature	Fixing the issue in the resource paths.	2017-05-05 23:59:14 +05:30
org.wso2.carbon.device.mgt.iot.androidsense.backend.feature	Merge branch 'wso2-master'	2017-05-08 14:28:07 +05:30
org.wso2.carbon.device.mgt.iot.androidsense.ui.feature	Removing unwanted p2.inf.	2017-05-05 23:52:50 +05:30
pom.xml	Merge branch 'wso2-master'	2017-05-08 14:28:07 +05:30