Merge "Revert "Merge branch 'frame-parallel' to enable frame parallel decode in maste...
authorJohann <johannkoenig@google.com>
Fri, 23 Jan 2015 16:43:15 +0000 (08:43 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Fri, 23 Jan 2015 16:43:15 +0000 (08:43 -0800)

Trivial merge