Merge "intra blocks disallowed inadvertently"
authorJim Bankoski <jimbankoski@google.com>
Wed, 13 Aug 2014 15:40:14 +0000 (08:40 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Wed, 13 Aug 2014 15:40:14 +0000 (08:40 -0700)
commit07c3abe21e2eab2e5e0c400376ddd3180f29edb4
treeeb5777d480a4e3cf62e799790cef34a9279ff8a5
parent2784a8fd24d8468ef793c89dfd9deb9b7c0caf8a
parent5c55202c6bbb7527b81c37f51f213bf338fedf59
Merge "intra blocks disallowed inadvertently"