Merge branch 'stable-3.6' into stable-3.7

* stable-3.6:
  Update gitignore

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