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.

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		10 years ago
..
agents/android/jax-rs/src/main/java/cdm/api/android	Merge branch 'master' of https://github.com/geethkokila/product-cdm	10 years ago
distribution	Merge branch 'master' of https://github.com/geethkokila/product-cdm	10 years ago
integration	…
mobileservices	Merge branch 'master' of https://github.com/geethkokila/product-cdm	10 years ago
p2-profile-gen	…
rest-api	…