tree 380a57ea7ae0cd405fd4f10085b82947a6e56482
parent 085f76e535a4376042d8eeadb1e4c5f246d74802
author Paul Wilkins <paulwilkins@google.com> 1397692435 -0700
committer Paul Wilkins <paulwilkins@google.com> 1397761531 -0700

Merge two new VBR adjustment schemes.

To make direct side by side testing this patch combines two
VBR corrections schemes to allow more direct side by side testing.
(The other patch was by Debargha chg id I0cd1f7...)

Change-Id: I271c45e5c4ccf8de8305589000218b80d9dc3a25