Menaka Jayawardena 0e32b646d3 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x ... # Conflicts: # components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/device-view.hbs		2016-12-07 12:09:50 +05:30
..
analytics	Adding the focus point for map	2016-12-06 17:29:41 +05:30
device-types	Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x	2016-12-07 12:09:50 +05:30
extensions	Merge pull request #455 from Megala21/embed	2016-12-06 17:32:50 +05:30
mobile-plugins	Merge branch 'android-sense-agent-fixes' into release-3.0.x	2016-12-07 11:00:49 +05:30