tree 8015c29f075b1b699ad855d9cbd6f058b95833c6
parent 3c1ffce4b6c746e26d07aad0ad71e4ca2444425d
parent 5bb43935e11b2abc623bb278af497a5bd4e16b09
author kpayson64 <kpayson@google.com> 1505960781 -0700
committer GitHub <noreply@github.com> 1505960781 -0700

Merge pull request #12661 from kpayson64/metaclass_fix_1.6

Backport #12615