1 files changed, 32 insertions, 23 deletions
diff --git a/.gitignore b/.gitignore
index aa8bb576..5b492835 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,29 +1,38 @@
-#Android specific
-bin
-gen
-obj
-lint.xml
-local.properties
-release.properties
-ant.properties
-*.class
+.classpath
+*.swp
+.settings
+
+# https://github.com/github/gitignore/blob/master/Gradle.gitignore
+.gradle/
+build/
+# Ignore Gradle GUI config
+gradle-app.setting
+
+# https://github.com/github/gitignore/blob/master/Android.gitignore
+# Built application files
 *.apk
+*.ap_
 
-#Gradle
-.gradle
-build
-gradle.properties
+# Files for the Dalvik VM
+*.dex
 
-#Maven
-target
-pom.xml.*
+# Java class files
+*.class
 
-#Eclipse
-.project
-.classpath
-.settings
-.metadata
+# Generated files
+bin/
+gen/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
 
-#IntelliJ IDEA
-.idea
 *.iml
+.idea
+
+import-summary.txt