Merge branch 'stable-3.5' into stable-3.6

* stable-3.5:
  Update gitignore

Change-Id: I5383b75f7fa54ab88c968cf6075504a1e44813b0
diff --git a/.gitignore b/.gitignore
index d392f0e..a9fe73b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 *.jar
+.idea
+*.iml