Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge commit '28731a0ad464b9aff456bf8e2deb05627dd7f080' into sslavin-…
…MM-1462-stub-clock # Conflicts: # infobip-mobile-messaging-android-sdk/src/androidTest/java/org/infobip/mobile/messaging/BatchReporterTest.java # infobip-mobile-messaging-android-sdk/src/androidTest/java/org/infobip/mobile/messaging/CustomUserDataTypeTest.java # infobip-mobile-messaging-android-sdk/src/androidTest/java/org/infobip/mobile/messaging/GeoEventsTest.java # infobip-mobile-messaging-android-sdk/src/androidTest/java/org/infobip/mobile/messaging/MessageStoreTest.java # infobip-mobile-messaging-android-sdk/src/androidTest/java/org/infobip/mobile/messaging/NotificationsTest.java # infobip-mobile-messaging-android-sdk/src/androidTest/java/org/infobip/mobile/messaging/RetryableSynchronizerTest.java # infobip-mobile-messaging-android-sdk/src/androidTest/java/org/infobip/mobile/messaging/SeenStatusReporterTest.java # infobip-mobile-messaging-android-sdk/src/androidTest/java/org/infobip/mobile/messaging/SeenStatusStorageTest.java # infobip-mobile-messaging-android-sdk/src/androidTest/java/org/infobip/mobile/messaging/SendMOMessageTest.java # infobip-mobile-messaging-android-sdk/src/androidTest/java/org/infobip/mobile/messaging/SystemDataReportTest.java # infobip-mobile-messaging-android-sdk/src/androidTest/java/org/infobip/mobile/messaging/UserDataSyncTest.java # infobip-mobile-messaging-android-sdk/src/androidTest/java/org/infobip/mobile/messaging/dal/sqlite/DatabaseHelperTest.java # infobip-mobile-messaging-android-sdk/src/androidTest/java/org/infobip/mobile/messaging/dal/sqlite/SharedPreferencesMigrationTest.java # infobip-mobile-messaging-android-sdk/src/androidTest/java/org/infobip/mobile/messaging/dal/sqlite/SqliteMessageMigrationTest.java # infobip-mobile-messaging-android-sdk/src/androidTest/java/org/infobip/mobile/messaging/dal/sqlite/SqliteMessageTest.java # infobip-mobile-messaging-android-sdk/src/androidTest/java/org/infobip/mobile/messaging/gcm/MessageHandlerTests.java # infobip-mobile-messaging-android-sdk/src/androidTest/java/org/infobip/mobile/messaging/geo/GeoHandlerTests.java # infobip-mobile-messaging-android-sdk/src/androidTest/java/org/infobip/mobile/messaging/geo/GeoMonitoringTest.java # infobip-mobile-messaging-android-sdk/src/androidTest/java/org/infobip/mobile/messaging/geo/GeoReportsTest.java # infobip-mobile-messaging-android-sdk/src/androidTest/java/org/infobip/mobile/messaging/geo/GeoStorageTest.java # infobip-mobile-messaging-android-sdk/src/androidTest/java/org/infobip/mobile/messaging/geo/GeoTransitionsTest.java # infobip-mobile-messaging-android-sdk/src/androidTest/java/org/infobip/mobile/messaging/geo/PushUnregisteredTest.java # infobip-mobile-messaging-android-sdk/src/androidTest/java/org/infobip/mobile/messaging/platform/AndroidBroadcasterTest.java # infobip-mobile-messaging-android-sdk/src/main/java/org/infobip/mobile/messaging/MobileMessagingCore.java # infobip-mobile-messaging-android-sdk/src/main/java/org/infobip/mobile/messaging/dal/sqlite/DatabaseHelper.java # infobip-mobile-messaging-android-sdk/src/main/java/org/infobip/mobile/messaging/gcm/MobileMessageHandler.java # infobip-mobile-messaging-android-sdk/src/main/java/org/infobip/mobile/messaging/geo/Area.java # infobip-mobile-messaging-android-sdk/src/main/java/org/infobip/mobile/messaging/geo/GeoNotificationHelper.java # infobip-mobile-messaging-android-sdk/src/main/java/org/infobip/mobile/messaging/geo/GeoReportHelper.java # infobip-mobile-messaging-android-sdk/src/main/java/org/infobip/mobile/messaging/geo/GeofencingConsistencyReceiver.java # infobip-mobile-messaging-android-sdk/src/main/java/org/infobip/mobile/messaging/mobile/geo/GeoReportingTask.java # infobip-mobile-messaging-android-sdk/src/main/java/org/infobip/mobile/messaging/mobile/messages/MessageSender.java
- Loading branch information