Merge "Fix a performance regression"
authorYaowu Xu <yaowu@google.com>
Tue, 16 Sep 2014 19:58:47 +0000 (12:58 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Tue, 16 Sep 2014 19:58:47 +0000 (12:58 -0700)

Trivial merge