You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Maximillian Leonov bea3661f81 Merge branch 'main' into feature-settings ... # Conflicts: # feature/settings/src/main/java/com/google/samples/apps/nowinandroid/feature/settings/SettingsDialog.kt		3 years ago
..
java/com/google/samples/apps/nowinandroid/feature/settings	Merge branch 'main' into feature-settings	3 years ago
res/values	Ellipsis string can be replaced with ellipsis character	3 years ago
AndroidManifest.xml	Replace hardcoded license file with OSS licenses plugin	3 years ago