Merge branch 'master' into stable

1 files changed, 13 insertions, 0 deletions

diff --git a/Source/Android/app/src/androidTest/java/org/dolphinemu/dolphinemu/ApplicationTest.java b/Source/Android/app/src/androidTest/java/org/dolphinemu/dolphinemu/ApplicationTest.java
new file mode 100644
index 0000000000..cf1848ddd5
--- /dev/null
+++ b/Source/Android/app/src/androidTest/java/org/dolphinemu/dolphinemu/ApplicationTest.java
@@ -0,0 +1,13 @@
+package org.dolphinemu.dolphinemu;
+
+import android.app.Application;
+import android.test.ApplicationTestCase;
+
+/**
+ * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
+ */
+public class ApplicationTest extends ApplicationTestCase<Application> {
+    public ApplicationTest() {
+        super(Application.class);
+    }
+}
\ No newline at end of file