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
..
android	Merge branch 'master' of https://github.com/geethkokila/product-cdm	2015-01-20 07:29:16 +05:30
windows/jax-rs	Refactor add new mobile service module to as parent to agent module	2015-01-19 21:38:41 +05:30