Android o preview 2
Merge "Update .gitignore file to ignore IntelliJ IDEA files"
am: 03585bc118

Change-Id: I8015d3e020cff8e2dc71c6568eb5a0bf698a36e5