.gitignore updates
authorPyry Haulos <phaulos@google.com>
Tue, 11 Nov 2014 18:14:39 +0000 (18:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 11 Nov 2014 18:14:39 +0000 (18:14 +0000)
automerge: 6bcd1ae

* commit '6bcd1aec3a0c75f8825f2d4289be00463cab7523':
  .gitignore updates


Trivial merge