tree b79f4c8bdc69e2d613d48a2dbf801865671a42e7
parent bc54862ce500c0788b05a06512df55d88b173cdd
parent 03585bc11841172414981d2cfdafc32a049c7236
author Paul Duffin <paulduffin@google.com> 1490366374 +0000
committer android-build-merger <android-build-merger@google.com> 1490366374 +0000

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

Change-Id: I8015d3e020cff8e2dc71c6568eb5a0bf698a36e5