Merge "Third set of checks of buffer level against maximum buffer size"
authorAdrian Grange <agrange@google.com>
Tue, 8 Nov 2011 16:00:31 +0000 (08:00 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Tue, 8 Nov 2011 16:00:31 +0000 (08:00 -0800)

Trivial merge