diff options
| author | Trevor Johns <trevorjohns@google.com> | 2013-10-30 13:31:54 -0700 |
|---|---|---|
| committer | Trevor Johns <trevorjohns@google.com> | 2013-10-30 13:31:54 -0700 |
| commit | bc6fe0f65025563ab50af193b099a8fca95ff0a2 (patch) | |
| tree | c992baefc7e136d81ec5788238f2e9a54a94e1cb /.gitignore | |
| parent | 86e6edc9f6faa35d841c684286450bc70d190c27 (diff) | |
| parent | 7a7aad0a012e738c58d1444f1669887bee16eb2a (diff) | |
| download | android-bc6fe0f65025563ab50af193b099a8fca95ff0a2.tar.gz | |
Merge downstream branch 'developers-dev' into 'klp-dev'
Consolidating changes from topic branch for release.
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/ + |