Merge "Removing unused function prototypes."
authorDmitry Kovalev <dkovalev@google.com>
Fri, 5 Sep 2014 00:28:16 +0000 (17:28 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Fri, 5 Sep 2014 00:28:16 +0000 (17:28 -0700)

Trivial merge