X1nto a15efbb4c0 Merge branch 'master' of https://github.com/microg/android_packages_apps_GmsCore ... Conflicts: build.gradle play-services-base-core/src/main/java/org/microg/gms/common/ForegroundServiceContext.java play-services-cast/src/main/java/com/google/android/gms/cast/Cast.java play-services-cast/src/main/java/com/google/android/gms/cast/CastRemoteDisplay.java play-services-cast/src/main/java/org/microg/gms/cast/CastApiClientBuilder.java play-services-cast/src/main/java/org/microg/gms/cast/CastClientImpl.java play-services-cast/src/main/java/org/microg/gms/cast/CastRemoteDisplayApiClientBuilder.java play-services-core/build.gradle play-services-core/microg-ui-tools/src/main/res/drawable/self_check.xml play-services-core/src/main/AndroidManifest.xml play-services-core/src/main/java/org/microg/gms/checkin/CheckinManager.java play-services-core/src/main/java/org/microg/gms/checkin/CheckinService.java play-services-core/src/main/java/org/microg/gms/snet/SafetyNetClientServiceImpl.java play-services-core/src/main/java/org/microg/gms/ui/CheckinFragment.java play-services-core/src/main/java/org/microg/gms/ui/GcmAppFragment.java play-services-core/src/main/java/org/microg/gms/ui/GcmFragment.java play-services-core/src/main/java/org/microg/gms/ui/SettingsActivity.java play-services-core/src/main/java/org/microg/gms/ui/UnifiedBackendDetailsActivity.java play-services-core/src/main/java/org/microg/gms/ui/UnifiedBackendListActivity.java play-services-core/src/main/res/drawable/dots_horizontal.xml play-services-core/src/main/res/drawable/ic_certificate.xml play-services-core/src/main/res/values/strings.xml play-services-core/src/main/res/xml/preferences_safetynet.xml play-services-core/src/main/res/xml/preferences_start.xml play-services-gcm/build.gradle play-services-gcm/src/main/java/com/google/android/gms/gcm/GcmReceiver.java play-services-iid/build.gradle play-services-iid/src/main/java/com/google/android/gms/iid/InstanceIDListenerService.java play-services-location-api/build.gradle play-services-location/build.gradle play-services-location/src/main/java/com/google/android/gms/location/ActivityRecognition.java play-services-location/src/main/java/com/google/android/gms/location/FusedLocationProviderApi.java play-services-location/src/main/java/com/google/android/gms/location/GeofencingApi.java play-services-location/src/main/java/com/google/android/gms/location/LocationServices.java play-services-location/src/main/java/com/google/android/gms/location/SettingsApi.java play-services-location/src/main/java/org/microg/gms/location/ActivityRecognitionApiClientBuilder.java play-services-location/src/main/java/org/microg/gms/location/ActivityRecognitionClientImpl.java play-services-location/src/main/java/org/microg/gms/location/FusedLocationProviderApiImpl.java play-services-location/src/main/java/org/microg/gms/location/GeofencingApiImpl.java play-services-location/src/main/java/org/microg/gms/location/GoogleLocationManagerClient.java play-services-location/src/main/java/org/microg/gms/location/LocationClientImpl.java play-services-location/src/main/java/org/microg/gms/location/LocationServicesApiClientBuilder.java play-services-wearable-api/build.gradle play-services-wearable/src/main/java/com/google/android/gms/wearable/Wearable.java play-services-wearable/src/main/java/org/microg/gms/wearable/WearableApiClientBuilder.java play-services-wearable/src/main/java/org/microg/gms/wearable/WearableClientImpl.java settings.gradle		2020-07-27 14:07:27 +04:00
..
src/main	Merge branch 'master' of https://github.com/microg/android_packages_apps_GmsCore	2020-07-27 14:07:27 +04:00
build.gradle	Use flavors for mapbox vs vtm	2020-07-09 09:53:37 +02:00