ref: c66320b3e4283b72dba38333ea9861354e159758
parent: bd1bc1d30392382d13c8238da3e2d24db7e98e71
parent: 8b0e6035a219d8df8a9ea09fa9c465ab484c8b62
author: Dmitry Kovalev <dkovalev@google.com>
date: Mon Aug 12 11:18:24 EDT 2013
Merge "Entropy context related cleanups."