ref: 3e466cea98eb6b45e0c0cd48456092cf677c2372
parent: 880ca0ecad0ba62d8e08c39602dc00346ec26521
parent: a18da9760a74d9ce6fb9f875706dc639c95402f5
author: Johann <johannkoenig@google.com>
date: Fri Jan 23 03:43:15 EST 2015
Merge "Revert "Merge branch 'frame-parallel' to enable frame parallel decode in master branch.""