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
..
agents/android/jax-rs/src/main/java/cdm/api/android	Merge branch 'master' of https://github.com/geethkokila/product-cdm	2015-01-20 07:29:16 +05:30
distribution	Merge branch 'master' of https://github.com/geethkokila/product-cdm	2015-01-20 07:29:16 +05:30
integration	Excluding unnecessary transtive dependencies getting downloaded	2015-01-18 17:58:37 +05:30
mobileservices	Merge branch 'master' of https://github.com/geethkokila/product-cdm	2015-01-20 07:29:16 +05:30
p2-profile-gen	Add governance and registry features	2015-01-15 10:59:56 +05:30
rest-api	Added CDM-REST APIs	2015-01-16 17:52:31 +05:30