tree 33bfb1e37b044d6f2e7b643132816418b6ef8a66
parent d36a10aceea547f367b56a796065014399d46f68
parent 935af93eaeac38b0855047c3eeaeabb23f741a14
author Ficus Kirkpatrick <ficus@android.com> 1394159144 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394159144 +0000

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

* commit '935af93eaeac38b0855047c3eeaeabb23f741a14':
  Update .gitignore for gradle etc