Merge "update .gitignore"
authorJames Zern <jzern@google.com>
Thu, 6 Feb 2014 02:45:51 +0000 (18:45 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Thu, 6 Feb 2014 02:45:51 +0000 (18:45 -0800)

Trivial merge