Merge "seeing a 10x slowing down, revert now for investigation"
authorYaowu Xu <yaowu@google.com>
Mon, 2 Jun 2014 16:02:32 +0000 (09:02 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Mon, 2 Jun 2014 16:02:32 +0000 (09:02 -0700)

Trivial merge