Merge "Eliminate num_8x8 and num_4x4 width/height lookups"
authorScott LaVarnway <slavarnway@google.com>
Thu, 9 Jul 2015 17:16:21 +0000 (17:16 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 9 Jul 2015 17:16:22 +0000 (17:16 +0000)

Trivial merge