Merge "fix building with --disable-spatial-resampling"
authorJames Zern <jzern@google.com>
Sat, 6 Dec 2014 04:36:44 +0000 (20:36 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Sat, 6 Dec 2014 04:36:44 +0000 (20:36 -0800)
commit0e00dbae0273d501bf01a48b246c2c5baf1f7f18
tree1412e2207b136d21273d53ce0b1b4a357098b9c8
parent3db785facc52dcd14f41c7a46a17bbfbcd161716
parent0e8cc9a82fcc49ee466f827e19139fb5e644404d
Merge "fix building with --disable-spatial-resampling"