From 95e7964912cb5fcc99727369cf00a451ef19c234 Mon Sep 17 00:00:00 2001 From: Aaron Culliney Date: Sun, 8 May 2016 13:54:28 -0700 Subject: [PATCH] Revert "Remove Android Studio file that always changes from revision control" This reverts commit 9f1f6e4fe12739b0e680b08000031f5adc92bfee. - OK apparently we do need to keep an eye on this, because Android Studio will clobber it every so often and result in a "weird" state where it can't build the project... --- .gitignore | 1 - Android/app/app.iml | 115 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 115 insertions(+), 1 deletion(-) create mode 100644 Android/app/app.iml diff --git a/.gitignore b/.gitignore index b7d1a426..d544ae4a 100644 --- a/.gitignore +++ b/.gitignore @@ -78,7 +78,6 @@ Android/jni/Android.mk # Android Studio .gradle -Android/app/app.iml Android/local.properties Android/.idea/workspace.xml Android/.idea/libraries diff --git a/Android/app/app.iml b/Android/app/app.iml new file mode 100644 index 00000000..97bc168f --- /dev/null +++ b/Android/app/app.iml @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file