Merge "Added a speed feature use_square_partition_only"
authorYaowu Xu <yaowu@google.com>
Wed, 3 Jul 2013 00:16:11 +0000 (17:16 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Wed, 3 Jul 2013 00:16:11 +0000 (17:16 -0700)

Trivial merge