diff --git a/Source/Android/res/values-ja/strings.xml b/Source/Android/res/values-ja/strings.xml
index f5858aa4bb..f489bc75f4 100644
--- a/Source/Android/res/values-ja/strings.xml
+++ b/Source/Android/res/values-ja/strings.xml
@@ -26,6 +26,10 @@
     <string name="settings">設定</string>
     <string name="about">について</string>
 
+    <!-- Game List Activity - Device Compatibility AlertDialog -->
+    <string name="device_compat_warning">デバイスの互換性の警告</string>
+    <string name="device_compat_warning_msg">この電話は、NEON拡張をサポートしていません。 おそらくDolphinを実行することはできません。\nあなたはとにかくそれを実行してみますか？</string>
+
     <!-- Game List Fragment -->
     <string name="file_clicked">クリックされたファイル： %1$s</string>
 
diff --git a/Source/Android/res/values/strings.xml b/Source/Android/res/values/strings.xml
index 0f56eb1df4..505c493afd 100644
--- a/Source/Android/res/values/strings.xml
+++ b/Source/Android/res/values/strings.xml
@@ -26,6 +26,10 @@
     <string name="settings">Settings</string>
     <string name="about">About</string>
 
+    <!-- Game List Activity - Device Compatibility AlertDialog -->
+    <string name="device_compat_warning">Device Compatibility Warning</string>
+    <string name="device_compat_warning_msg">Your phone doesn\'t support NEON which makes it incapable of running Dolphin Mobile?\nDo you want to try anyway?</string>
+
     <!-- Game List Fragment -->
     <string name="file_clicked">File clicked: %1$s</string>
 
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/NativeLibrary.java b/Source/Android/src/org/dolphinemu/dolphinemu/NativeLibrary.java
index 7d655566d3..d5c10f8fad 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/NativeLibrary.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/NativeLibrary.java
@@ -107,7 +107,7 @@ public final class NativeLibrary
 	/**
 	 * Returns if the phone supports NEON or not
 	 *
-	 * @return if it supports NEON
+	 * @return true if it supports NEON, false otherwise.
 	 */
 	public static native boolean SupportsNEON();
 
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListActivity.java b/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListActivity.java
index 2a1ae4a8b2..eba52036e5 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListActivity.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListActivity.java
@@ -112,8 +112,8 @@ public final class GameListActivity extends Activity
 		if (Build.CPU_ABI.contains("arm") && !NativeLibrary.SupportsNEON())
 		{
 			AlertDialog.Builder builder = new AlertDialog.Builder(this);
-			builder.setTitle("ALERT!");
-			builder.setMessage("Your phone doesn't support NEON which makes it incapable of running Dolphin Mobile?\nDo you want to try anyway?");
+			builder.setTitle(R.string.device_compat_warning);
+			builder.setMessage(R.string.device_compat_warning_msg);
 			builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
 				public void onClick(DialogInterface dialog, int which) {
 					// Do Nothing. Just create the Yes button