am 83c5b5b2: am 935af93e: Merge "Update .gitignore for gradle etc"

* commit '83c5b5b266b82e2f92184ea29d0d68eb56031135':
  Update .gitignore for gradle etc