From 52eec8d5587035079004080d0bd5c9952d6c82bc Mon Sep 17 00:00:00 2001
From: jturmel <jturmel@gmail.com>
Date: Mon, 10 Feb 2014 10:24:05 -0600
Subject: [PATCH 1/2] Add AndroidStudio gitignore file

---
 AndroidStudio.gitignore | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 AndroidStudio.gitignore

diff --git a/AndroidStudio.gitignore b/AndroidStudio.gitignore
new file mode 100644
index 00000000..2f94f599
--- /dev/null
+++ b/AndroidStudio.gitignore
@@ -0,0 +1,32 @@
+# 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

From 9a0f32a452d0e7fc70680a0049e06c22f7144c47 Mon Sep 17 00:00:00 2001
From: jturmel <jturmel@gmail.com>
Date: Wed, 12 Feb 2014 10:33:49 -0600
Subject: [PATCH 2/2] Remove AndroidStudio, modify Global/JetBrains

* Remove AndroidStudio.gitignore in favor of adding the
  change needed to the Global/JetBrains.gitignore file
---
 AndroidStudio.gitignore    | 32 --------------------------------
 Global/JetBrains.gitignore |  3 +++
 2 files changed, 3 insertions(+), 32 deletions(-)
 delete mode 100644 AndroidStudio.gitignore

diff --git a/AndroidStudio.gitignore b/AndroidStudio.gitignore
deleted file mode 100644
index 2f94f599..00000000
--- 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 0d6cf0de..47e551f5 100644
--- 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