ref: f80a346e0e0171632c3422407245e4a382ce6b2d
parent: d5ae43318e5910e9ed96219aa6345915295bda8e
parent: 4345d12d2875531fadb11b67a69f8c8326cc8564
author: Dmitry Kovalev <dkovalev@google.com>
date: Thu Jun 12 09:07:11 EDT 2014
Merge "Replacing txfm_size with tx_size."