From 96ae6099dd5921ae32139a206d598043520fb506 Mon Sep 17 00:00:00 2001
From: "Z.J. van de Weg" <zegerjan@gitlab.com>
Date: Thu, 16 Jun 2016 10:39:17 +0200
Subject: Run rake gitlab:update_templates

---
 vendor/gitignore/Android.gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'vendor/gitignore/Android.gitignore')

diff --git a/vendor/gitignore/Android.gitignore b/vendor/gitignore/Android.gitignore
index a8368751267..f6b286cea98 100644
--- a/vendor/gitignore/Android.gitignore
+++ b/vendor/gitignore/Android.gitignore
@@ -2,7 +2,7 @@
 *.apk
 *.ap_
 
-# Files for the Dalvik VM
+# Files for the ART/Dalvik VM
 *.dex
 
 # Java class files
@@ -34,6 +34,7 @@ captures/
 
 # Intellij
 *.iml
+.idea/workspace.xml
 
 # Keystore files
 *.jks
-- 
cgit v1.2.3