resolved conflicts for merge of 13ef17a3 to mnc-dr-dev

[android-x86/packages-apps-Launcher3.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index f830c66..aea5d61 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,10 @@
 db_files
+*.iml
+.project
+.classpath
+.project.properties
+gen/
+tests/stress/gen/
+WallpaperPicker/gen/
+WallpaperPicker/.project.properties
+bin/