Merge "Fix a bug from merging frame parallel branch into master."
authorhkuang <hkuang@google.com>
Tue, 3 Feb 2015 01:08:42 +0000 (17:08 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Tue, 3 Feb 2015 01:08:42 +0000 (17:08 -0800)
commit4ed539f22e9e735c3cad4175d62f7aabf617ce62
tree96ad4a1bdf950e511e63c9b1090172435b6550bd
parent5085f8d2a4b3aa7b7613737d83f8d867b18651d1
parent94a459522e486483b97b40f31a049a34c8e58ce5
Merge "Fix a bug from merging frame parallel branch into "