Revert "Travis-CI: Try again"

This reverts commit 1f6ce644a7ee7d1c21276af15837d9676dede4af.
diff --git a/.travis.yml b/.travis.yml
index ab9c4a9..86aee57 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,4 +7,27 @@
     - android-22
     - extra-android-support
     - extra-android-m2repository
-    - extra-google-m2repository
\ No newline at end of file
+    - extra-google-m2repository
+
+    # Additional components
+    #- extra-google-google_play_services
+    #- addon-google_apis-google-19
+
+    # Specify at least one system image, if you need to run emulator(s) during your tests
+    #- sys-img-armeabi-v7a-android-19
+    #- sys-img-x86-android-17
+env:
+  global:
+   # install timeout in minutes (2 minutes by default)
+    - ADB_INSTALL_TIMEOUT=8
+
+# Emulator Management: Create, Start and Wait
+before_script:
+  - echo no | android create avd --force -n test -t android-21 --abi armeabi-v7a
+  - emulator -avd test -no-skin -no-audio -no-window &
+  - android-wait-for-emulator
+  - adb shell input keyevent 82 &
+
+script:
+  - android list target
+  - ./gradlew connectedAndroidTest
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 86e383e..b9b26c4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -29,9 +29,6 @@
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-	lintOptions {
-		abortOnError false
-	}
 }
 
 dependencies {