Merge "Use average mb energy from first pass in AQ2 test."
authorPaul Wilkins <paulwilkins@google.com>
Mon, 8 Dec 2014 17:01:39 +0000 (09:01 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Mon, 8 Dec 2014 17:01:39 +0000 (09:01 -0800)

Trivial merge