manoj 72a3df080b Merge branch 'master' of https://github.com/geethkokila/product-cdm ... Conflicts: components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagementRepository.java components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementServiceComponent.java product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/util/AndroidAPIUtils.java product/pom.xml		2015-01-20 07:29:16 +05:30
..
org.wso2.carbon.device.mgt.common	Merge branch 'master' of https://github.com/geethkokila/product-cdm	2015-01-20 07:29:16 +05:30
org.wso2.carbon.device.mgt.core	Merge branch 'master' of https://github.com/geethkokila/product-cdm	2015-01-20 07:29:16 +05:30
org.wso2.carbon.device.mgt.mobile.impl	Fixed conflicts in merge	2015-01-19 09:24:52 +05:30
pom.xml	Pom cleanup	2015-01-06 22:00:36 +05:30