Merge "Bug when last group before forced key frame is short."
authorPaul Wilkins <paulwilkins@google.com>
Thu, 22 Jan 2015 16:28:19 +0000 (08:28 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Thu, 22 Jan 2015 16:28:19 +0000 (08:28 -0800)

Trivial merge