Merge "Fix vp10 high bit-depth build"
authorJames Zern <jzern@google.com>
Fri, 11 Sep 2015 18:27:49 +0000 (18:27 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 11 Sep 2015 18:27:49 +0000 (18:27 +0000)

Trivial merge