diff options
| author | Trevor Johns <trevorjohns@google.com> | 2013-10-30 21:57:35 +0000 |
|---|---|---|
| committer | Trevor Johns <trevorjohns@google.com> | 2013-10-30 21:57:35 +0000 |
| commit | ec985147ec781dfff9a229c6b794ee4eac0ced91 (patch) | |
| tree | e2a89c3e427d9af663d0399b5aa0f61e7ffa3f7a /.gitignore | |
| parent | bc6fe0f65025563ab50af193b099a8fca95ff0a2 (diff) | |
| download | android-ec985147ec781dfff9a229c6b794ee4eac0ced91.tar.gz | |
Revert "Merge downstream branch 'developers-dev' into 'klp-dev'"
Undoing recent merge to get a clean klp-dev samples release without
template code. Will un-revert for followup release with templates after
that build has been cut.
This reverts commit bc6fe0f65025563ab50af193b099a8fca95ff0a2.
Change-Id: Icd2b9772986de7c4978a92e7e22bb2c2cef20bd0
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 12 |
1 files changed, 5 insertions, 7 deletions
@@ -11,9 +11,7 @@ # generated files bin/ out/ -src/common -src/template -_index.jd +gen/ # Libraries used by the app # Can explicitly add if we want, but shouldn't do so blindly. Licenses, bloat, etc. @@ -21,8 +19,10 @@ _index.jd # Build stuff (auto-generated by android update project ...) +build.xml ant.properties local.properties +project.properties # Eclipse project files .classpath @@ -35,7 +35,5 @@ local.properties *.ipr *.iws -##Gradle-based build -.gradle -build/ - +#gitignore file +.gitignore |