mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2026-09-19 08:44:06 -05:00
Conflicts: Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java
Conflicts: Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java