You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		8 years ago
..
org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature	Fixing the issue in the resource paths.	8 years ago
org.wso2.carbon.device.mgt.iot.androidsense.backend.feature	Merge branch 'wso2-master'	8 years ago
org.wso2.carbon.device.mgt.iot.androidsense.ui.feature	Removing unwanted p2.inf.	8 years ago
pom.xml	Merge branch 'wso2-master'	8 years ago