Ryan Houdek ba18f38e70 Merge branch 'master' into android-new-control-input-overlay ...

Conflicts:
	Source/Android/res/values-ja/strings.xml
	Source/Android/res/values/strings.xml
	Source/Android/src/org/dolphinemu/dolphinemu/AboutFragment.java
	Source/Android/src/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java
	Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java
	Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListActivity.java
	Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java

2013-11-24 16:12:00 -06:00

..

emuwindow_overlay.xml

Merge branch 'master' into android-new-control-input-overlay

2013-11-24 16:12:00 -06:00

gamelist_menu.xml

[Android] Forgot to commit the menu layout XML when I implemented the option to clear the game list.

2013-08-23 16:17:02 -04:00