Merge "vp9: Nonrd mode: use content_state_sb for high motion."
authorMarco Paniconi <marpan@google.com>
Fri, 7 Jul 2017 03:00:59 +0000 (03:00 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 7 Jul 2017 03:00:59 +0000 (03:00 +0000)

Trivial merge