Merge "Set default encode test driver to 1 column and 1 thread."
authorFrank Galligan <fgalligan@google.com>
Fri, 13 Mar 2015 22:07:16 +0000 (15:07 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Fri, 13 Mar 2015 22:07:16 +0000 (15:07 -0700)

Trivial merge