Merge "Modified no memory rate control."
authorPaul Wilkins <paulwilkins@google.com>
Mon, 21 Oct 2013 17:32:47 +0000 (10:32 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Mon, 21 Oct 2013 17:32:47 +0000 (10:32 -0700)

Trivial merge