ref: c97d435243caeac0bfc21d34244bd3fe5e6f686f
parent: 469ff48d7bdbd2e39ca4c8ec2a530a6e79f85b39
parent: bc5d3fae5c56311c689b99f49724dc8b59ea42f8
author: Yaowu Xu <yaowu@google.com>
date: Wed Jan 21 03:58:09 EST 2015
Merge "Replace "colorspace" with "color_space""