prabathabey 8b9cf0da85 Resolving conflicts caused by merging with the updates in master		2016-05-25 17:37:21 +05:30
..
src/main/java/org/wso2/carbon/device/mgt/common	Resolving conflicts caused by merging with the updates in master	2016-05-25 17:37:21 +05:30
pom.xml	[maven-release-plugin] prepare for next development iteration	2016-05-20 16:43:16 +05:30