Merge "Using buf_2d struct instead of separate buffer and stride vars."
authorDmitry Kovalev <dkovalev@google.com>
Fri, 9 Aug 2013 18:50:58 +0000 (11:50 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Fri, 9 Aug 2013 18:50:58 +0000 (11:50 -0700)

Trivial merge