Merge "Fix ARM build problem introduced by CL I3fab6f2b"
authorJohann <johannkoenig@google.com>
Thu, 27 Oct 2011 18:17:54 +0000 (11:17 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Thu, 27 Oct 2011 18:17:54 +0000 (11:17 -0700)

Trivial merge