Remove AndroidStudio, modify Global/JetBrains

* Remove AndroidStudio.gitignore in favor of adding the
  change needed to the Global/JetBrains.gitignore file

diff --git a/AndroidStudio.gitignore b/AndroidStudio.gitignore
deleted file mode 100644 (file)
index 2f94f59..0000000
--- a/AndroidStudio.gitignore
+++ /dev/null
@@ -1,32 +0,0 @@
-# Built application files
-*.apk
-*.ap_
-
-# Files for the Dalvik VM
-*.dex
-
-# Java class files
-*.class
-
-# Generated files
-bin/
-gen/
-
-# Gradle files
-.gradle/
-build/
-
-# Local configuration file (sdk path, etc)
-local.properties
-
-# Proguard folder generated by Eclipse
-proguard/
-
-# IDE specific configuration
-.idea
-
-# Intellij module files
-*.iml
-
-# Crashlytics auto-generated file for Android Studio plugin
-com_crashlytics_export_strings.xml

diff --git a/Global/JetBrains.gitignore b/Global/JetBrains.gitignore
index 0d6cf0de51242fc5286250d586f5362a5daa651a..47e551f5e7d411e3df97e1993f5628adc27e8b52 100644 (file)
--- a/Global/JetBrains.gitignore
+++ b/Global/JetBrains.gitignore
@@ -24,3 +24,6 @@ out/
 
 # generated by JIRA plugin
 atlassian-ide-plugin.xml
+
+# generated by Crashlytics plugin (for Android Studio and Intellij)
+com_crashlytics_export_strings.xml