DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master

Bug: 120848293
Change-Id: Ib1bcf352079c36a81dfb676795cafc6c91f6a9a3
diff --git a/.gitignore b/.gitignore
index bff2d76..c62bff3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 *.iml
+.gradle