<<<<<<< HEAD
# Android generated
bin/
gen/

# Ant
build.xml
local.properties

# Maven
target/
pom.xml.*
release.properties

# Eclipse
.classpath
.project
.externalToolBuilders/
.apt_generated/

# IntelliJ
=======
# built application files
*.apk
*.ap_

# files for the dex VM
*.dex

# Java class files
*.class

# generated files
bin/
gen/

# Local configuration file (sdk path, etc)
local.properties

# Eclipse project files
.classpath
.project

# Proguard folder generated by Eclipse
proguard/

# Intellij project files
>>>>>>> 75d17e79abd77f9fdabf6fd441c19507c6e8de7d
*.iml
*.ipr
*.iws
.idea/
<<<<<<< HEAD
out/
output/
.gitignore.orig
.project.bak
.settings/org.eclipse.core.resources.prefs
.settings/org.eclipse.core.runtime.prefs
.settings/org.eclipse.jdt.apt.core.prefs
.settings/org.eclipse.jdt.core.prefs
.settings/org.eclipse.jdt.launching.prefs
.settings/
.properties
**/*.iml
**/*/.idea
**/.idea
.gradle
build/
**/.gradle
**/*/build
**/build
# key info:
ultimateandroid.jks
keystore.properties
gradleinfo.properties


# Ignore Gradle GUI config
gradle-app.setting
manifest-merger-release-report.txt
*.apk
=======

>>>>>>> 75d17e79abd77f9fdabf6fd441c19507c6e8de7d