Merge "Remove redundant code"
authorYaowu Xu <yaowu@google.com>
Wed, 3 Sep 2014 21:55:28 +0000 (14:55 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Wed, 3 Sep 2014 21:55:28 +0000 (14:55 -0700)

Trivial merge