tree 9e0e66ab811b9986897da5a7045354d29a719d5d
parent 3a1969b22c265004742ed8fcc26cbfd750a5f023
parent 688063bf33c95251098b38d234119b95011b778d
author Paul Duffin <paulduffin@google.com> 1490369888 +0000
committer android-build-merger <android-build-merger@google.com> 1490369888 +0000

Merge "Update .gitignore file to ignore IntelliJ IDEA files"
am: 688063bf33

Change-Id: I17ffe8568e7752906bdf17135b54da8fc7389b49