android: merge .gitignore

12 months ago · a21b345652
2 changed files with 10 additions and 10 deletions
--- a/.gitignore
+++ b/.gitignore
@ -29,3 +29,13 @@ CMakeSettings.json
				@@ -29,3 +29,13 @@ CMakeSettings.json
 CMakeFiles
 CMakeCache.txt
 Makefile
+
+# Android Studio/Gradle
+.gradle/
+.externalNativeBuild
+.cxx/
+.idea/
+local.properties
+.project
+.classpath
+.settings
--- a/android/.gitignore
+++ b/android/.gitignore
@ -1,10 +0,0 @@
				@@ -1,10 +0,0 @@
-.gradle/
-build/
-.externalNativeBuild
-.cxx/
-.idea/
-local.properties
-.project
-.classpath
-.gradle
-.settings