OSDN Git Service

resolved conflicts for merge of 13ef17a3 to mnc-ub-dev
[android-x86/packages-apps-Trebuchet.git] / .gitignore
1 db_files
2 *.iml
3 .project
4 .classpath
5 .project.properties
6 gen/
7 tests/stress/gen/
8 WallpaperPicker/gen/
9 WallpaperPicker/.project.properties
10 bin/