community/device-mgt-plugins
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-plugins.git synced 2025-09-16 23:42:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,737 Commits 11 Branches 275 Tags 396 MiB
4007f50063
Commit Graph

390 Commits

Author SHA1 Message Date
lasanthaDLPDS
01cc7edeff Fix android web app deploying issue 2019-12-04 20:12:57 +05:30
lasanthaDLPDS
47e569fa08 Fix android web app deploying issue 2019-12-04 18:18:19 +05:30
inoshperera
a5008504ee minor formatting fixes 2019-12-04 10:25:54 +05:30
inoshperera
e91a7b7e52 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt-plugins 2019-12-04 10:00:46 +05:30
shamalka
a04338e09e Replace class locations in cfx-servlet 2019-12-03 19:49:20 +05:30
shamalka
7c69a296c5 Add wipe API for Google enterprise 2019-12-03 14:56:51 +05:30
shamalka
70c980f46f Replace BadRequestException in Android APIs 2019-12-03 11:21:14 +05:30
lasanthaDLPDS
acbfdad962 Fix test failures in Android plugins 2019-12-02 11:02:02 +05:30
shamalka
f35050c24a Seperate android API logics 2019-11-29 21:53:04 +05:30
lasanthaDLPDS
e3c6bb319b Format Android plugin source 2019-11-28 08:55:17 +05:30
lasanthaDLPDS
e5abe5dc91 Remove unused AndroidDeviceManagementService class 2019-11-25 11:29:46 +05:30
lasanthaDLPDS
eb2156c54e Improve android ent app syncing flow 2019-11-18 13:49:49 +05:30
Nipun Nadeen De Silva
2374f26f3c Create the display-message-configuration policy 2019-11-16 07:50:55 +00:00
inoshperera
ad00959465 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt-plugins 2019-11-15 12:25:03 +05:30
inoshperera
9efd3c601d Add wipe API for Google enterprise 2019-11-15 09:53:02 +05:30
inoshperera
742081c94e insert user improvement for Google EMM 2019-11-05 16:06:09 +05:30
lasanthaDLPDS
b12b6865b7 Make Http Client closable for enrollment app install 2019-11-01 22:15:03 +05:30
inoshperera
54c2de4230 uninstall related fix 2019-10-28 20:49:17 +05:30
charitha
fc77713384 Fix test failure 2019-10-26 01:25:00 +05:30
Dharmakeerthi Lasantha
9524b5b90a Merge branch 'test' into 'application-mgt-new' 
Add operation to enable/disable lock task mode of KIOSK devices

See merge request entgra/carbon-device-mgt-plugins!99
 2019-10-22 17:21:34 +00:00
lasanthaDLPDS
d506fe000e Merge branch 'application-mgt-new' of https://gitlab.com/entgra/carbon-device-mgt-plugins into application-mgt-new 2019-10-20 09:05:08 +05:30
lasanthaDLPDS
92adedcd8d Improve app uninstalling response handeling 2019-10-19 11:02:31 +05:30
sandarudr
13620d5c11 Add operation to enable/disable lock-task mode 2019-10-18 18:50:08 +05:30
Jayasanka
8f9b7164cc Fix 415 error in delete endpoints of Android Enterprise API 2019-10-17 15:28:19 +05:30
Jayasanka
40bfb2175c Change logger level to warn when Android Enterprise is not configured 2019-10-14 12:27:47 +05:30
Saad Sahibjan
6901747aeb Add null and empty check for device location related values 2019-10-10 15:55:45 +05:30
lasanthaDLPDS
cbc37c47d2 Sync with upstream master 2019-10-04 18:17:11 +05:30
Inosh Perara
cfd30f87fd Add APIs for Google Enterprise 
This commit will add API needed for devices to communicate with the server to get a token and also adds back Android plugin DB access to communicate with Android plugin related database.
 2019-10-04 12:31:22 +00:00
achala piyarathna
cb446acc16 Fix build failure 2019-10-04 12:30:33 +00:00
achala piyarathna
bebf47981d Device location history view feature 2019-10-03 16:33:33 +00:00
Saad Sahibjan
43d855ec09 Merge branch 'master' into 'master' 
Fix incorrect device view issue in android.

See merge request entgra/carbon-device-mgt-plugins!87
 2019-10-03 10:08:49 +00:00
lasanthaDLPDS
1960c01462 Fix incorrect device view issue in android. 2019-10-03 11:04:55 +05:30
charitha
752af2ca41 FIx test failure 2019-10-01 09:30:30 +05:30
charitha
5f274bdc19 Merge with upstream/master 2019-09-20 14:21:15 +05:30
Amanda Randombage
f89a6d9fb8 Fix test failure and improve disenrolling API 
-Remove query param from disenrolling API
 2019-09-19 21:38:41 +00:00
charitha
4ca700d873 Fix test failures 2019-09-17 20:05:25 +05:30
lasanthaDLPDS
90f7d1045f Fix merge conflicts 2019-09-13 07:51:21 +05:30
Saad Sahibjan
51f74d7744 Modify enrollment app install android policy to support new app manager 2019-08-29 13:13:38 +05:30
Pahansith
bc38a4a6d6 Fix test fail due to not overriding getDeviceConfiguration method 2019-08-27 23:37:22 +05:30
lasanthaDLPDS
7d04c04045 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt-plugins into application-mgt-new 2019-08-22 17:59:20 +05:30
Pahansith
48c89b06b9 Add test case for newly added method on DeviceManagementProviderService 2019-08-14 08:59:29 +05:30
inoshperera
c1184167df Fix https://gitlab.com/entgra/product-iots/issues/125 2019-08-08 14:54:47 +05:30
lasanthaDLPDS
02d4d5d7ac Merge with master branch 2019-07-17 18:27:53 +05:30
Ace
36022e6b94 Adding dummy implementation for new interface method 2019-07-04 14:15:51 +05:30
lasanthaDLPDS
3aff323f4d Improve APPM device subs updating method 2019-06-27 23:38:00 +05:30
lasanthaDLPDS
8039031447 Remove wso2 appm connector and add entgra appm feature 2019-06-26 19:30:52 +05:30
Saad Sahibjan
a6f0a71681 Check null of pending operations before updating status 2019-06-26 05:57:41 +05:30
Saad Sahibjan
281e0a636e Update pending operations status of device to be disenrolled 2019-06-25 19:37:15 +05:30
Saad Sahibjan
8efd8c74db Modify android disenroll device API to support permanently delete device 2019-06-24 15:14:47 +05:30
lasanthaDLPDS
84bd576094 Merge with upstream master 2019-06-17 20:29:50 +05:30
Ace
8e37d1e648 Fixing build break due to missing method implementation in test interfaces 2019-06-03 22:38:36 +05:30
charitha
4bc04b7923 Add notifier type details 2019-06-01 13:22:21 +05:30
lasanthaDLPDS
e6d687acbd Fix compilation failure 2019-05-31 13:02:29 +05:30
Asanka Kumara
db3004ab91 Override getDevice methods in DeviceManagementProviderServiceMock 2019-05-27 08:40:04 +00:00
sandaru daminda
b6c4163878 Add remote configuration feature to android device mgt plugin 
Application list response sends "SAME_APPLICATION_LIST" flag if app list is not changed. This is not being handled in the server side properly.
 2019-05-14 03:21:19 +00:00
Charitha Goonetilleke
986c9461ac Add capability to store device type specific platform configurations for any device type 2019-04-26 02:44:43 +00:00
Saad Sahibjan
03352259be Implement updateEnrollment in DeviceManagementProviderServiceMock 2019-04-18 20:22:01 +05:30
Charitha Goonetilleke
ab309f4485 Merge branch 'master' into 'master' 
Fix application update issue

See merge request entgra/carbon-device-mgt-plugins!28
 2019-04-10 02:56:08 +00:00
Milan Perera
747770a8f0 Fix application update issue 
Application list response sends "SAME_APPLICATION_LIST" flag if app list is not changed. This is not being handled in the server side properly.
 2019-04-09 14:09:56 +05:30
Charitha Goonetilleke
68a0979bce Add OpenVPN policy 2019-03-11 08:09:09 +00:00
Saad Sahibjan
96c72e14b4 Add server version in configuration entries 
Add license header
 2019-03-06 14:09:00 +05:30
Madawa Soysa
f19ce5f8e1 Adding payload validation for global proxy 2019-02-08 21:37:20 +11:00
Madawa Soysa
601f527fb5 Add more details for the debug log 2019-02-02 15:40:55 +11:00
Madawa Soysa
967eb3ce31 Refactor global proxy implementation 2019-01-30 22:48:13 +11:00
Madawa Soysa
9c220a5b44 Add permission for global proxy operation & refactor 
Refactored API path for global-proxy operation and add permissions and scopes to the API
 2019-01-29 11:08:28 +11:00
Madawa Soysa
61210bd73e Implement new API for the global proxy policy 2019-01-29 11:08:28 +11:00
Saad Sahibjan
a31afaa85f Fix mock service broken due to core changes in DeviceManagementProviderService 2019-01-25 13:49:34 +05:30
charitha
ab40b7b6b8 Merge remote-tracking branch 'entgra/master' into entgra-master 2019-01-14 16:48:50 +05:30
charitha
6fdbfe2497 Update devicemgt core version to latest 2019-01-14 16:48:42 +05:30
Saad Sahibjan
8355861083 Enrollment application install feature for policy 2019-01-01 08:13:48 +00:00
charitha
618cc1b854 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into entgra-master 
# Conflicts:
#	components/analytics/iot-analytics/org.wso2.carbon.device.mgt.cdmf.analytics/pom.xml
#	components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/pom.xml
#	components/analytics/iot-analytics/org.wso2.carbon.iot.device.statistics.dashboard/pom.xml
#	components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/pom.xml
#	components/analytics/iot-analytics/pom.xml
#	components/analytics/pom.xml
#	components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/pom.xml
#	components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.api/pom.xml
#	components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/pom.xml
#	components/device-types/androidsense-plugin/pom.xml
#	components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.analytics/pom.xml
#	components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.api/pom.xml
#	components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/pom.xml
#	components/device-types/arduino-plugin/pom.xml
#	components/device-types/pom.xml
#	components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/pom.xml
#	components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.api/pom.xml
#	components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/pom.xml
#	components/device-types/raspberrypi-plugin/pom.xml
#	components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.impl/pom.xml
#	components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.analytics/pom.xml
#	components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/pom.xml
#	components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/pom.xml
#	components/device-types/virtual-fire-alarm-plugin/pom.xml
#	components/extensions/appm-connector/org.wso2.carbon.appmgt.mdm.osgiconnector/pom.xml
#	components/extensions/appm-connector/org.wso2.carbon.appmgt.mdm.restconnector/pom.xml
#	components/extensions/appm-connector/pom.xml
#	components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.extension/pom.xml
#	components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.http/pom.xml
#	components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.mqtt/pom.xml
#	components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.thrift/pom.xml
#	components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.xmpp/pom.xml
#	components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.http/pom.xml
#	components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.mqtt/pom.xml
#	components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.websocket.endpoint/pom.xml
#	components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.websocket/pom.xml
#	components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.xmpp/pom.xml
#	components/extensions/cdmf-transport-adapters/pom.xml
#	components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.api/pom.xml
#	components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization/pom.xml
#	components/extensions/mb-extensions/pom.xml
#	components/extensions/pom.xml
#	components/extensions/pull-notification-listeners/org.wso2.carbon.device.mgt.mqtt.notification.listener/pom.xml
#	components/extensions/pull-notification-listeners/pom.xml
#	components/extensions/remote-session-extension/org.wso2.carbon.device.mgt.extensions.remote.session.endpoint/pom.xml
#	components/extensions/remote-session-extension/org.wso2.carbon.device.mgt.extensions.remote.session/pom.xml
#	components/extensions/remote-session-extension/pom.xml
#	components/extensions/siddhi-extensions/org.wso2.extension.siddhi.device/pom.xml
#	components/extensions/siddhi-extensions/org.wso2.extension.siddhi.execution.json/pom.xml
#	components/extensions/siddhi-extensions/org.wso2.gpl.siddhi.extension.geo.script/pom.xml
#	components/extensions/siddhi-extensions/pom.xml
#	components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/pom.xml
#	components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/test/java/org/wso2/carbon/mdm/services/android/mocks/DeviceManagementProviderServiceMock.java
#	components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/pom.xml
#	components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/pom.xml
#	components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/public/assets/android-agent.apk
#	components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.v09.api/pom.xml
#	components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.v09.api/src/test/java/org/wso2/carbon/mdm/services/android/mocks/DeviceManagementProviderServiceMock.java
#	components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/pom.xml
#	components/mobile-plugins/android-plugin/pom.xml
#	components/mobile-plugins/pom.xml
#	components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/pom.xml
#	components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/pom.xml
#	components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows/pom.xml
#	components/mobile-plugins/windows-plugin/pom.xml
#	components/test-coverage/pom.xml
#	features/analytics-feature/org.wso2.carbon.device.mgt.cdmf.analytics.feature/pom.xml
#	features/analytics-feature/org.wso2.carbon.device.mgt.iot.analytics.feature/pom.xml
#	features/analytics-feature/org.wso2.carbon.iot.device.statistics.dashboard.feature/pom.xml
#	features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/pom.xml
#	features/analytics-feature/pom.xml
#	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.backend.feature/pom.xml
#	features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.ui.feature/pom.xml
#	features/device-types-feature/androidsense-plugin-feature/pom.xml
#	features/device-types-feature/arduino-plugin-feature/org.wso2.carbon.device.mgt.iot.arduino.analytics.feature/pom.xml
#	features/device-types-feature/arduino-plugin-feature/org.wso2.carbon.device.mgt.iot.arduino.backend.feature/pom.xml
#	features/device-types-feature/arduino-plugin-feature/org.wso2.carbon.device.mgt.iot.arduino.ui.feature/pom.xml
#	features/device-types-feature/arduino-plugin-feature/pom.xml
#	features/device-types-feature/pom.xml
#	features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics.feature/pom.xml
#	features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.backend.feature/pom.xml
#	features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.ui.feature/pom.xml
#	features/device-types-feature/raspberrypi-plugin-feature/pom.xml
#	features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.analytics.feature/pom.xml
#	features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature/pom.xml
#	features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/pom.xml
#	features/device-types-feature/virtual-fire-alarm-plugin-feature/pom.xml
#	features/extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.api.feature/pom.xml
#	features/extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature/pom.xml
#	features/extensions-feature/org.wso2.carbon.appmgt.mdm.osgiconnector.feature/pom.xml
#	features/extensions-feature/org.wso2.carbon.appmgt.mdm.restconnector.feature/pom.xml
#	features/extensions-feature/org.wso2.carbon.device.mgt.adapter.feature/pom.xml
#	features/extensions-feature/org.wso2.carbon.device.mgt.notification.listener.feature/pom.xml
#	features/extensions-feature/org.wso2.carbon.device.mgt.remote.session.feature/pom.xml
#	features/extensions-feature/org.wso2.extension.siddhi.device.feature/pom.xml
#	features/extensions-feature/org.wso2.extension.siddhi.execution.json.feature/pom.xml
#	features/extensions-feature/org.wso2.gpl.siddhi.extension.geo.script.feature/pom.xml
#	features/extensions-feature/pom.xml
#	features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/pom.xml
#	features/mobile-plugins-feature/android-plugin-feature/pom.xml
#	features/mobile-plugins-feature/pom.xml
#	features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/pom.xml
#	features/mobile-plugins-feature/windows-plugin-feature/pom.xml
#	pom.xml
 2018-10-30 15:55:38 +05:30
charitha
6fbc4e1def Fixed test failure 2018-10-24 11:08:26 +05:30
charitha
f69c1ba0c7 Bump devicemgt version 2018-10-19 23:30:11 +05:30
lasanthaDLPDS
4e30859563 Fix device type deploying issue 2018-10-17 18:27:00 +05:30
charitha
5bbb45ce84 Fixed issue in device type config operation 
- Device type config operation throws invalid device identifieres exception when changing configurations without having active devices
 2018-10-08 23:19:52 +05:30
charitha
211391fb02 Fixed issue in device type config operation 
- Device type config operation throws invalid device identifieres exception when changing configurations without having active devices
 2018-10-08 13:31:25 +05:30
Charitha Goonetilleke
5996ddb5e1 Merge branch 'master' into 'master' 
Whitelabel device types

See merge request entgra/carbon-device-mgt-plugins!2
 2018-09-27 13:18:33 +00:00
charitha
a113b4bdba Updated device-mgt version 2018-09-27 12:12:32 +05:30
Milan Perera
3b57b9a9fb Whitelabel devic types 2018-09-27 11:25:37 +05:30
inoshperera
44228ba37c fixing build brake 2018-09-22 11:29:28 +05:30
charitha
f1607f868d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into entgra-master 
# Conflicts:
#	pom.xml
 2018-09-19 13:46:05 +05:30
shagihan
1aeede731f Fixing code formatting. 2018-08-31 11:30:48 +05:30
shagihan
058cb22358 Formating fixes 2018-08-30 16:28:05 +05:30
shagihan
c3a92664fc Updates polling period of android devices by an API call. 2018-08-30 16:25:11 +05:30
charitha
99054e1e77 Prevent duplicate alerts & added owner field 2018-08-03 22:32:16 +05:30
charitha
7766055d17 Update geo location API 2018-07-23 11:40:23 +05:30
geethkokila
6882a560bc Fixing the error in event publishing 
This is error occurrs when the event publishing cause and error, it does not print any log.
 2018-01-29 10:20:43 +05:30
geethkokila
f551a88d2e Fixing the error in event publishing 
This is error occurrs when the event publishing cause and error, it does not print any log.
 2018-01-29 10:12:51 +05:30
Rasika Perera
b5604670c8
Merge branch 'master' into fix-1611 2018-01-23 18:43:21 +05:30
Rasika Perera
c56bdd5d6b Fixing https://github.com/wso2/product-iots/issues/1611 2018-01-23 14:00:42 +05:30
geethkokila
40484b5d6b Updating the carbon-device-mgt version 
This upgrade has api changes due to fixes to the policy monitoring
 2018-01-22 17:29:44 +05:30
lasantha
48fdda4e38 adding latest android agent and fixing test failures 2017-12-24 21:44:04 +05:30
Ace
d57cb4a3a1 Bumping cdmf version and updating unit tests 2017-11-30 10:52:30 +05:30
Gathika94
6b6b82e639 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-11-23 14:43:13 +05:30
charitha
82c7eefd2e Fix for https://github.com/wso2/product-iots/issues/1496 2017-11-23 14:39:08 +05:30
Gathika94
6bcbf4e5dd minor changes 2017-11-22 21:44:51 +05:30
charitha
6828d0ae41 Bumping device-mgt-core to latest release 2017-10-30 15:50:45 +05:30
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
Nirothipan
1f484e6a53 resolving conflicts 2017-10-18 14:31:12 +05:30
Nirothipan
5b86f692c1 resolving conflicts 2017-10-18 14:30:39 +05:30