Merge "refactor reset_skip_txfm_size and elimate a lot of code"
authorJim Bankoski <jimbankoski@google.com>
Mon, 24 Mar 2014 18:08:27 +0000 (11:08 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Mon, 24 Mar 2014 18:08:27 +0000 (11:08 -0700)

Trivial merge