Merge "Removed code no longer being used." into experimental
authorYaowu Xu <yaowu@google.com>
Tue, 30 Apr 2013 19:26:09 +0000 (12:26 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Tue, 30 Apr 2013 19:26:09 +0000 (12:26 -0700)

Trivial merge