Merge branch 'wso2-master'

# Conflicts:
#	features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature/pom.xml
#	features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.ui.feature/pom.xml
This commit is contained in:
sinthuja 2017-05-08 18:10:17 +05:30
commit 19225bdc86

Diff Content Not Available