Merge "Fixed a build issue"
authorYaowu Xu <yaowu@google.com>
Tue, 25 Mar 2014 17:22:18 +0000 (10:22 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Tue, 25 Mar 2014 17:22:18 +0000 (10:22 -0700)

Trivial merge