From 9c6c78a47295f69c30b62bec9ff0cfb170e00bca Mon Sep 17 00:00:00 2001
From: Frieder Bluemle <frieder.bluemle@gmail.com>
Date: Mon, 16 Oct 2017 11:47:57 +0800
Subject: [PATCH 1/5] Revert "Commenting out Android keystore files"

This reverts commit 77145f787f311efa66c570c5ffadea10a429bf21.
---
 Android.gitignore | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Android.gitignore b/Android.gitignore
index 5d18272e..cc118917 100644
--- a/Android.gitignore
+++ b/Android.gitignore
@@ -52,9 +52,8 @@ captures/
 .idea/navEditor.xml
 
 # Keystore files
-# Uncomment the following lines if you do not want to check your keystore files in.
-#*.jks
-#*.keystore
+*.jks
+*.keystore
 
 # External native build folder generated in Android Studio 2.2 and later
 .externalNativeBuild

From 5f92ce62c13bf50aa03420bad0e3b935fa056dc2 Mon Sep 17 00:00:00 2001
From: Frieder Bluemle <frieder.bluemle@gmail.com>
Date: Wed, 20 Feb 2019 17:33:34 +0800
Subject: [PATCH 2/5] Revert "add android lint files"

This reverts commit 240dd3f3213b53f96932a8d92dfb523ccb51c099.
---
 Android.gitignore | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/Android.gitignore b/Android.gitignore
index cc118917..1dd87777 100644
--- a/Android.gitignore
+++ b/Android.gitignore
@@ -77,12 +77,5 @@ fastlane/readme.md
 # Version control
 vcs.xml
 
-# lint
-lint/intermediates/
-lint/generated/
-lint/outputs/
-lint/tmp/
-# lint/reports/
-
 # Android Profiling
 *.hprof

From d799074b87ae019ebe394da6ea466cbf838fc8db Mon Sep 17 00:00:00 2001
From: Frieder Bluemle <frieder.bluemle@gmail.com>
Date: Fri, 6 Dec 2019 13:34:53 -0800
Subject: [PATCH 3/5] Revert "Added aar file type to gitignore (#3233)"

This reverts commit 1c114570c7659a59613ebc1fe45a5b07918df105.
---
 Android.gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Android.gitignore b/Android.gitignore
index 1dd87777..85629de8 100644
--- a/Android.gitignore
+++ b/Android.gitignore
@@ -1,6 +1,5 @@
 # Built application files
 *.apk
-*.aar
 *.ap_
 *.aab
 

From 9ed4f28d3ba067841d45679491038de443de00db Mon Sep 17 00:00:00 2001
From: Frieder Bluemle <frieder.bluemle@gmail.com>
Date: Thu, 1 Jun 2017 15:30:55 +0800
Subject: [PATCH 4/5] [Android] Cleanup and remove legacy stuff

---
 Android.gitignore | 67 +++++++----------------------------------------
 1 file changed, 9 insertions(+), 58 deletions(-)

diff --git a/Android.gitignore b/Android.gitignore
index 85629de8..741323c6 100644
--- a/Android.gitignore
+++ b/Android.gitignore
@@ -1,21 +1,3 @@
-# Built application files
-*.apk
-*.ap_
-*.aab
-
-# Files for the ART/Dalvik VM
-*.dex
-
-# Java class files
-*.class
-
-# Generated files
-bin/
-gen/
-out/
-#  Uncomment the following line in case you need and you don't have the release build type files in your app
-# release/
-
 # Gradle files
 .gradle/
 build/
@@ -23,58 +5,27 @@ build/
 # Local configuration file (sdk path, etc)
 local.properties
 
-# Proguard folder generated by Eclipse
-proguard/
-
-# Log Files
+# Log/OS Files
 *.log
+.DS_Store
 
-# Android Studio Navigation editor temp files
-.navigation/
-
-# Android Studio captures folder
+# Android Studio generated files and folders
 captures/
+.externalNativeBuild/
+.cxx/
+*.apk
+output.json
 
 # IntelliJ
 *.iml
-.idea/workspace.xml
-.idea/tasks.xml
-.idea/gradle.xml
-.idea/assetWizardSettings.xml
-.idea/dictionaries
-.idea/libraries
-.idea/jarRepositories.xml
-# Android Studio 3 in .gitignore file.
-.idea/caches
-.idea/modules.xml
-# Comment next line if keeping position of elements in Navigation Editor is relevant for you
-.idea/navEditor.xml
+.idea/
 
 # Keystore files
 *.jks
 *.keystore
 
-# External native build folder generated in Android Studio 2.2 and later
-.externalNativeBuild
-.cxx/
-
 # Google Services (e.g. APIs or Firebase)
-# google-services.json
-
-# Freeline
-freeline.py
-freeline/
-freeline_project_description.json
-
-# fastlane
-fastlane/report.xml
-fastlane/Preview.html
-fastlane/screenshots
-fastlane/test_output
-fastlane/readme.md
-
-# Version control
-vcs.xml
+google-services.json
 
 # Android Profiling
 *.hprof

From 7e98309900ad82ce64a60070c7d051d47c5692c9 Mon Sep 17 00:00:00 2001
From: Brian Douglas <bdougie@users.noreply.github.com>
Date: Fri, 3 Dec 2021 11:56:33 -0800
Subject: [PATCH 5/5] removes .DS-Store from the PR 2402

Feel free to open a new PR for discussion on this.
---
 Android.gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Android.gitignore b/Android.gitignore
index 741323c6..a68e5b57 100644
--- a/Android.gitignore
+++ b/Android.gitignore
@@ -7,7 +7,6 @@ local.properties
 
 # Log/OS Files
 *.log
-.DS_Store
 
 # Android Studio generated files and folders
 captures/