tree ba267981f5efcb2143d8bde5358aeece3f8954c2
parent ff0b0147477279ddd914d86c295cdd92eb771d7e
parent 1e1912e8147813d63faf3c3a687a6f664dbe7bbb
author Ying Wang <wangying@google.com> 1440678096 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440678096 +0000

am 1e1912e8: (-s ours) am f63d822b: Ignore .pyc files.

* commit '1e1912e8147813d63faf3c3a687a6f664dbe7bbb':