Merge "Replace "colorspace" with "color_space""
authorYaowu Xu <yaowu@google.com>
Wed, 21 Jan 2015 16:58:09 +0000 (08:58 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Wed, 21 Jan 2015 16:58:09 +0000 (08:58 -0800)

Trivial merge