Merge "Simplification of decoder's code." into experimental
authorDmitry Kovalev <dkovalev@google.com>
Tue, 9 Apr 2013 17:10:29 +0000 (10:10 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Tue, 9 Apr 2013 17:10:29 +0000 (10:10 -0700)

Trivial merge