Merge "Adding type casts to remove C++ compiler errors."
authorDmitry Kovalev <dkovalev@google.com>
Wed, 12 Mar 2014 07:22:34 +0000 (00:22 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Wed, 12 Mar 2014 07:22:34 +0000 (00:22 -0700)

Trivial merge