Merge "Cleanups around cpi->common."
authorDmitry Kovalev <dkovalev@google.com>
Thu, 9 Jan 2014 01:48:28 +0000 (17:48 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Thu, 9 Jan 2014 01:48:28 +0000 (17:48 -0800)

Trivial merge