Merge "Further clean up of estimate_max_q."
authorYaowu Xu <yaowu@google.com>
Mon, 9 Dec 2013 23:35:00 +0000 (15:35 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Mon, 9 Dec 2013 23:35:00 +0000 (15:35 -0800)

Trivial merge