mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2026-08-31 15:20:38 -05:00
Conflicts: Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java
Conflicts: Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java