commit a6b4636faeaa3613bae3dfcbed7fd8886d615714
author Trevor Johns <trevorjohns@google.com> Wed Oct 30 16:38:01 2013 -0700
committer Trevor Johns <trevorjohns@google.com> Wed Oct 30 16:38:01 2013 -0700
tree 1d5208749f6fcad3523f88da60ab48294c264ce0
parent 27162ffddab31cb4d7f4eb1177c5fe7fc48875a9

Restore "Merge downstream branch 'developers-dev' into 'klp-dev'"

This reverts commit ec985147ec781dfff9a229c6b794ee4eac0ced91.

.gitignore

diff --git a/.gitignore b/.gitignore
index 2dd1573..627e46f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,7 +11,9 @@
 # generated files
 bin/
 out/
-gen/
+src/common
+src/template
+_index.jd
 
 # Libraries used by the app
 # Can explicitly add if we want, but shouldn't do so blindly.  Licenses, bloat, etc.
@@ -19,10 +21,8 @@
 
 
 # Build stuff (auto-generated by android update project ...)
-build.xml
 ant.properties
 local.properties
-project.properties
 
 # Eclipse project files
 .classpath
@@ -35,5 +35,7 @@
 *.ipr
 *.iws
 
-#gitignore file
-.gitignore
+##Gradle-based build
+.gradle
+build/
+