tree 8ae74274a6a49332e7c20d0eb2f2c1fd8d454dd0
parent cb621ef0dd9c1930eb2976b1e49adb00a35c350b
parent 4432f0ff5e9c85f23549ea1e0f2e121fb16fd51b
author Ying Wang <wangying@google.com> 1440674177 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440674177 +0000

am 4432f0ff: (-s ours) am 0b1ee9ec: Ignore .pyc files.

* commit '4432f0ff5e9c85f23549ea1e0f2e121fb16fd51b':