commit e1f0839c09d447e1b16cffcd5055ab1e8b613db1
author Hyunyoung Song <hyunyoungs@google.com> Wed Apr 08 21:58:36 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Apr 08 21:58:36 2015 +0000
tree 7acb666e950851af122d7f24b3e687c0fff017d8
parent 5e7978f35f1c5c40ca838bd54a79043d9a2969f1
parent c14e0a4ba827b52ec5c7460f8128b8ea0a10cce4

am c14e0a4b: Merge "update .gitignore config file so that we do not have to scroll through the unstaged items to pick which one to stage." into ub-launcher3-burnaby

* commit 'c14e0a4ba827b52ec5c7460f8128b8ea0a10cce4':
  update .gitignore config file so that we do not have to scroll through the unstaged items to pick which one to stage.

.gitignore

diff --git a/.gitignore b/.gitignore
index 4d5667e..aea5d61 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,9 @@
 *.iml
 .project
 .classpath
+.project.properties
 gen/
 tests/stress/gen/
 WallpaperPicker/gen/
+WallpaperPicker/.project.properties
+bin/