Merge "vp10: only assume ONLY_4X4 if segmentation is disabled."
authorYaowu Xu <yaowu@google.com>
Tue, 5 Jan 2016 02:29:05 +0000 (02:29 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 5 Jan 2016 02:29:05 +0000 (02:29 +0000)

Trivial merge