mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2026-01-04 19:01:10 -05:00
Conflicts: Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java
Conflicts: Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java