Merge "Mute the harmless tsan error in frame parallel decode."
authorhkuang <hkuang@google.com>
Thu, 5 Feb 2015 20:44:04 +0000 (12:44 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Thu, 5 Feb 2015 20:44:04 +0000 (12:44 -0800)

Trivial merge