Merge "Removing old code."
authorDmitry Kovalev <dkovalev@google.com>
Tue, 5 Nov 2013 22:28:43 +0000 (14:28 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Tue, 5 Nov 2013 22:28:43 +0000 (14:28 -0800)

Trivial merge