ref: c5718a7aa3b5490fbfbc47d6f82e7cb3eed46a1e
parent: d4761cff369065f9d85929013873e16f86adbc95
parent: 4bc7f4828fc0cb95027ab1fde476b4d05a2b1f80
author: Yaowu Xu <yaowu@google.com>
date: Fri Feb 13 11:40:41 EST 2015
Merge "Fix an encoder/decode mismatch bug"