From e612775922ec9f8cc4e5cb976bc62b3312a3de0e Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Tue, 21 Jul 2015 17:01:26 -0700
Subject: resolved conflicts for merge of 13ef17a3 to mnc-dr-dev b/22609402
 Change-Id: I140cf972d57e14737a6f91c0b4a8ec6c7ff1af2b

---
 .gitignore | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index f830c66eb..aea5d6102 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,10 @@
 db_files
+*.iml
+.project
+.classpath
+.project.properties
+gen/
+tests/stress/gen/
+WallpaperPicker/gen/
+WallpaperPicker/.project.properties
+bin/
-- 
cgit v1.2.3