device-mgt-plugins/features/extensions-feature/org.wso2.carbon.device.mgt.adapter.feature
charitha 94097dd0c0 Merge branch 'master' into add-emm-analytics
# Conflicts:
#	components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/impl/EventReceiverServiceImpl.java
#	components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/util/AndroidAPIUtils.java
#	pom.xml
2017-10-30 10:20:16 +05:30
..
src/main/resources removed unused files 2017-06-12 11:40:24 +05:30
pom.xml Merge branch 'master' into add-emm-analytics 2017-10-30 10:20:16 +05:30