Merge "Fix vp9_rd_pick_inter/intra function types"
authorJingning Han <jingning@google.com>
Tue, 14 Oct 2014 16:10:11 +0000 (09:10 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Tue, 14 Oct 2014 16:10:11 +0000 (09:10 -0700)

Trivial merge