Merge "Initially add frame_parallel_decode flag."
authorhkuang <hkuang@google.com>
Thu, 12 Jun 2014 22:01:38 +0000 (15:01 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Thu, 12 Jun 2014 22:01:38 +0000 (15:01 -0700)

Trivial merge