Andreas E 7f88b56d8b Resolve merge conflicts 5 lat temu
..
debug 233dbec4b3 Add adaptive icon and a dev variant 7 lat temu
main 7f88b56d8b Resolve merge conflicts 5 lat temu
standard e2a9c09597 Move google-services.json 5 lat temu
test bf5065d16b Minor cleanup, remove some usages of ArrayList 5 lat temu