diff options
| author | Trevor Johns <trevorjohns@google.com> | 2013-10-30 16:38:01 -0700 |
|---|---|---|
| committer | Trevor Johns <trevorjohns@google.com> | 2013-10-30 16:38:01 -0700 |
| commit | a6b4636faeaa3613bae3dfcbed7fd8886d615714 (patch) | |
| tree | 1d5208749f6fcad3523f88da60ab48294c264ce0 /.gitignore | |
| parent | 27162ffddab31cb4d7f4eb1177c5fe7fc48875a9 (diff) | |
| download | android-a6b4636faeaa3613bae3dfcbed7fd8886d615714.tar.gz | |
Restore "Merge downstream branch 'developers-dev' into 'klp-dev'"
This reverts commit ec985147ec781dfff9a229c6b794ee4eac0ced91.
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 12 |
1 files changed, 7 insertions, 5 deletions
@@ -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 @@ gen/ # Build stuff (auto-generated by android update project ...) -build.xml ant.properties local.properties -project.properties # Eclipse project files .classpath @@ -35,5 +35,7 @@ project.properties *.ipr *.iws -#gitignore file -.gitignore +##Gradle-based build +.gradle +build/ + |