Merge "Simplify rate-distortion modeling function"
authorJingning Han <jingning@google.com>
Mon, 15 Dec 2014 22:37:19 +0000 (14:37 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Mon, 15 Dec 2014 22:37:19 +0000 (14:37 -0800)

Trivial merge