Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into entgra-master

# Conflicts:
#	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

@@ -471,11 +471,21 @@ public class DeviceManagementProviderServiceMock implements DeviceManagementProv
         return 0;
     }
 
+    @Override
+    public List<Activity> getActivitiesUpdatedAfterByUser(long l, String s, int i, int i1) throws OperationManagementException {
+        return null;
+    }
+
     @Override
     public int getActivityCountUpdatedAfter(long l) throws OperationManagementException {
         return 0;
     }
 
+    @Override
+    public int getActivityCountUpdatedAfterByUser(long l, String s) throws OperationManagementException {
+        return 0;
+    }
+
     @Override
     public List<MonitoringOperation> getMonitoringOperationList(String s) {
         return null;

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

@@ -471,11 +471,21 @@ public class DeviceManagementProviderServiceMock implements DeviceManagementProv
         return 0;
     }
 
+    @Override
+    public List<Activity> getActivitiesUpdatedAfterByUser(long l, String s, int i, int i1) throws OperationManagementException {
+        return null;
+    }
+
     @Override
     public int getActivityCountUpdatedAfter(long l) throws OperationManagementException {
         return 0;
     }
 
+    @Override
+    public int getActivityCountUpdatedAfterByUser(long l, String s) throws OperationManagementException {
+        return 0;
+    }
+
     @Override
     public List<MonitoringOperation> getMonitoringOperationList(String s) {
         return null;