Merge pull request #1625 from unknownbrackets/android-minor

Android: Ignore some generated files

.gitignore

@@ -8,6 +8,8 @@ Source/Core/Common/scmrev.h
 /[Bb]uild*/
 /[Bb]inary/
 /obj/
+# Android cmake builds to here then copies to Source/Android.
+/libs/
 # Ignore various files created by visual studio/msbuild
 *.ipch
 *.opensdf

Source/Android/.gitignore

@@ -9,8 +9,13 @@
 *.class
 
 # generated files
-bin/
-gen/
+/bin/
+/gen/
+/libs/
+/obj/
+
+# Copied by cmake
+/assets/
 
 # Local configuration file (sdk path, etc)
 local.properties