tree b79f4c8bdc69e2d613d48a2dbf801865671a42e7
parent 53dc31a07e80a6da2c4fcc2a4a12db69f4f38c2d
parent 040b2c0a15fc824c813584b3e7caf705aaa4c88c
author Paul Duffin <paulduffin@google.com> 1490366644 +0000
committer android-build-merger <android-build-merger@google.com> 1490366644 +0000

Merge "Update .gitignore file to ignore IntelliJ IDEA files" am: 03585bc118 am: 2916273738
am: 040b2c0a15

Change-Id: I46441d26b2257ba71f39a009ccd9039a0b3d01d1