Merge ".gitignore updates"
authorPyry Haulos <phaulos@google.com>
Wed, 29 Oct 2014 01:33:03 +0000 (01:33 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 29 Oct 2014 01:33:03 +0000 (01:33 +0000)

Trivial merge