ref: 67fb0679ee4e528a0f77c6e569ae17914133301e
parent: 55b52e32dae74604d3d773a6bca1b8b821a50598
parent: 5ebe503f0431b319e83be2158b8d43f38ccdd3f2
author: Yaowu Xu <yaowu@google.com>
date: Thu Jul 18 13:50:34 EDT 2013
Merge "Merge scale_factors and scale_factors_uv."