tree 49a1af22b22ee55bffcac5578b3f90d6714ac4a0
parent 0a857961b3d336d02a66b9cf5786b08699d6a69d
parent 2347d60ac02a9d0c7b1a279756f8093f3d66173a
author Brian Carlstrom <bdc@google.com> 1425427789 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425427789 +0000

am 2347d60a: Merge "Remove old build options from .gitignore"

* commit '2347d60ac02a9d0c7b1a279756f8093f3d66173a':
  Remove old build options from .gitignore