it232115 2c32a1b6d5 Merge remote-tracking branch 'origin/master' ... # Conflicts: # app/src/main/java/com/example/oplogy/SetupActivity.java		2024-06-18 14:57:09 +09:00
..
androidTest/java/com/example/oplogy	test	2024-05-28 14:14:36 +09:00
main	Merge remote-tracking branch 'origin/master'	2024-06-18 14:57:09 +09:00
test/java/com/example/oplogy	test	2024-05-28 14:14:36 +09:00