Merge "This removes a test that fails on 32 bit"
authorJim Bankoski <jimbankoski@google.com>
Mon, 28 Jul 2014 14:17:27 +0000 (07:17 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Mon, 28 Jul 2014 14:17:27 +0000 (07:17 -0700)

Trivial merge